Jonathan G Rennison 3adeff1883 Merge branch 'master' into jgrpp ...

# Conflicts:
#	CMakeLists.txt
#	cmake/CompileFlags.cmake
#	src/bridge_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/town_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/toolbar_gui.cpp
#	src/town.h
#	src/town_cmd.cpp

2020-06-30 21:43:04 +01:00

..

Baseset.cmake

Codechange: rework how grf and ob[msg] are generated

2020-06-05 19:36:05 +02:00

CreateGRF.cmake

Codechange: rework how grf and ob[msg] are generated

2020-06-05 19:36:05 +02:00

FindVersion.cmake

Merge branch 'master' into jgrpp

2020-06-30 21:43:04 +01:00

Regression.cmake

Codechange: move regression outside of bin and make it work via CMake script

2020-06-05 19:36:05 +02:00