mirror of
https://github.com/vcmi/vcmi.git
synced 2025-07-15 01:24:45 +02:00
Merge branch 'develop' of git://github.com/Macron1Robot/vcmi into WarmysBackup
Conflicts: client/CKingdomInterface.cpp
This commit is contained in:
@ -953,4 +953,4 @@ void CHeroItem::onArtChange(int tabIndex)
|
||||
//redraw item after background change
|
||||
if (active)
|
||||
redraw();
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user