Jonathan G Rennison 43980639de Merge branch 'master' into jgrpp ...

# Conflicts:
#	.gitignore
#	CMakeLists.txt
#	src/3rdparty/optional/optional.hpp
#	src/group_cmd.cpp
#	src/industry_cmd.cpp
#	src/misc_gui.cpp
#	src/video/sdl2_v.cpp

2021-01-29 17:45:15 +00:00

..

regression

Merge branch 'master' into jgrpp

2021-01-29 17:45:15 +00:00

stationlist

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

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

regression.cfg

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

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