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
..
CMakeLists.txt	Merge branch 'develop' into handlersAbstraction	2021-07-16 00:32:13 +03:00
dmg_background.png	another OS X patch from stopiccot	2012-12-27 09:21:30 +00:00
dmg_background.psd	another OS X patch from stopiccot	2012-12-27 09:21:30 +00:00
dmg_DS_Store	CMake: try to enable automated DS_Store generation for Mac	2017-08-21 17:04:53 +03:00
DS_Store_Setup.scpt	CMake: try to enable automated DS_Store generation for Mac	2017-08-21 17:04:53 +03:00
Info.plist.in	macOS: full rework of Mac packaging process	2017-08-16 16:10:07 +03:00
vcmi.icns	macOS: full rework of Mac packaging process	2017-08-16 16:10:07 +03:00