1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00

Merge branch 'develop' into feature/tavernRumors

Conflicts:
	lib/CGameState.h
This commit is contained in:
ArseniyShestakov
2015-12-05 01:01:26 +03:00
64 changed files with 438 additions and 367 deletions

View File

@ -16,6 +16,7 @@
#include "CTownHandler.h"
#include "mapping/CMapInfo.h"
#include "StartInfo.h"
#include "CPlayerState.h"
/*
* NetPacksLib.cpp, part of VCMI engine