games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'remotes/origin/develop' into issue/2306

Browse Source 
s reverts commit fa8a282696.

Conflicts:
	AI/VCAI/VCAI.cpp

Conflicts:
	AI/VCAI/VCAI.cpp
	client/windows/CAdvmapInterface.cpp
	lib/CPathfinder.cpp
	lib/CPathfinder.h
This commit is contained in:
AlexVinS
2015-12-05 12:56:12 +03:00
parent 1bcfa986e4 7708810148
commit 0fab319c73
103 changed files with 2492 additions and 1265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/CQuery.cpp
View File

@@ -2,6 +2,7 @@
#include "CQuery.h"
#include "CGameHandler.h"
#include "../lib/BattleState.h"
#include "../lib/mapObjects/MiscObjects.h"
boost::mutex Queries::mx;