1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00

Merge branch 'develop' of git://github.com/Macron1Robot/vcmi into WarmysBackup

Conflicts:
	client/CKingdomInterface.cpp
This commit is contained in:
DjWarmonger
2014-05-02 12:03:02 +02:00
31 changed files with 4972 additions and 4862 deletions

View File

@@ -14,7 +14,7 @@
namespace GameConstants
{
const std::string VCMI_VERSION = "VCMI 0.95";
const std::string VCMI_VERSION = "VCMI 0.95b";
const int BFIELD_WIDTH = 17;
const int BFIELD_HEIGHT = 11;