AlexVinS 0fab319c73 Merge remote-tracking branch 'remotes/origin/develop' into issue/2306 ... s reverts commit fa8a282696. Conflicts: AI/VCAI/VCAI.cpp Conflicts: AI/VCAI/VCAI.cpp client/windows/CAdvmapInterface.cpp lib/CPathfinder.cpp lib/CPathfinder.h		2015-12-05 12:56:12 +03:00
..
CGameHandler.cpp	Merge remote-tracking branch 'remotes/origin/develop' into issue/2306	2015-12-05 12:56:12 +03:00
CGameHandler.h	removed few more includes from headers	2015-12-02 22:10:46 +02:00
CMakeLists.txt	Include ZLib headers for launcher and server	2014-10-12 16:33:38 +03:00
CQuery.cpp	Merge remote-tracking branch 'remotes/origin/develop' into issue/2306	2015-12-05 12:56:12 +03:00
CQuery.h	Add "override" to virtual overriden methods	2015-10-13 21:05:36 +03:00
CVCMIServer.cpp	Fix pthread_mutex_lock abort() in requestActionASAP impl	2015-10-31 18:04:06 +03:00
CVCMIServer.h	c++03 -> c++11 switch:	2013-06-26 11:18:27 +00:00
NetPacksServer.cpp	Fix pthread_mutex_lock abort() in requestActionASAP impl	2015-10-31 18:04:06 +03:00
StdInc.cpp	* Final commit	2011-12-13 21:35:28 +00:00
StdInc.h	Fix pthread_mutex_lock abort() in requestActionASAP impl	2015-10-31 18:04:06 +03:00
VCMI_server.cbp	Changed windows minimum version back to winxp due to mingw bug	2015-08-20 04:22:54 +03:00
VCMI_server.vcxproj	Migrating to MSVS 2013, which allows to delete inttypes.h file.	2014-08-31 19:08:39 +02:00