Jonathan G Rennison 828d2146eb Merge branch 'master' into jgrpp ... # Conflicts: # CMakeLists.txt # bin/ai/CMakeLists.txt # bin/game/CMakeLists.txt # src/ai/ai_info.cpp # src/company_base.h # src/economy.cpp # src/game/game_info.cpp # src/gfx_type.h # src/linkgraph/linkgraph_gui.cpp # src/palette.cpp # src/palette_func.h # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/ship_cmd.cpp # src/train_cmd.cpp # src/vehicle_base.h # src/window.cpp # src/window_func.h		2024-02-26 18:19:34 +00:00
..
compat_1.2.nut
compat_1.3.nut
compat_1.4.nut
compat_1.5.nut
compat_1.6.nut
compat_1.7.nut
compat_1.8.nut
compat_1.9.nut
compat_1.10.nut
compat_1.11.nut
compat_12.nut
compat_13.nut
compat_14.nut	Codechange: We are heading to 15	2024-02-18 21:48:54 +01:00
compat_15.nut	Codechange: We are heading to 15	2024-02-18 21:48:54 +01:00
compat_brgs.nut