Jonathan G Rennison 7154f8859d Merge tag '1.11.0-beta1' into jgrpp ... # Conflicts: # src/console_cmds.cpp # src/gfx_func.h # src/industry.h # src/lang/czech.txt # src/lang/estonian.txt # src/lang/german.txt # src/lang/indonesian.txt # src/lang/japanese.txt # src/lang/norwegian_bokmal.txt # src/lang/russian.txt # src/lang/slovak.txt # src/saveload/saveload.h # src/station_gui.cpp # src/town_gui.cpp # src/vehicle_gui.cpp # src/video/sdl2_v.cpp # src/waypoint_gui.cpp		2021-02-01 18:58:36 +00:00
..
ai	Codechange: move regression outside of bin and make it work via CMake script	2020-06-05 19:36:05 +02:00
game	Merge tag '1.11.0-beta1' into jgrpp	2021-02-01 18:58:36 +00:00
scripts
CMakeLists.txt	CMake: Copy bin/ subdirs to build directory	2020-07-04 21:04:16 +01:00