Andrii Danylchenko 9c8d776398 Merge branch 'develop' into handlersAbstraction ... # Conflicts: # CI/linux/before_install.sh # CI/mac/before_install.sh # CI/mxe/before_install.sh # lib/CModHandler.cpp # lib/mapObjects/CObjectClassesHandler.cpp # lib/mapObjects/CObjectClassesHandler.h # lib/mapObjects/CommonConstructors.cpp # server/CGameHandler.cpp # test/CMakeLists.txt # test/spells/effects/TeleportTest.cpp		2021-07-16 00:32:13 +03:00
..
CMapEditManagerTest.cpp	Fixed a bad fix. Fixed more warnings.	2020-10-04 16:26:45 -07:00
CMapFormatTest.cpp	Merge branch 'develop' into handlersAbstraction	2021-07-16 00:32:13 +03:00
MapComparer.cpp	Redone RMG template serialization using JSON serializer, added tests	2018-03-10 19:36:19 +03:00
MapComparer.h	[tests] Moved JsonComparer to own file	2018-03-05 21:26:00 +03:00