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
..
CMakeLists.txt	Change: [CMake] Use explicit list for regression (#11541)	2023-12-05 15:37:53 +01:00
info.nut	Codechange: We are heading to 15	2024-02-18 21:48:54 +01:00
main.nut	Merge branch 'master' into jgrpp	2024-02-19 23:11:00 +00:00
require.nut
result.txt	Merge branch 'master' into jgrpp	2024-02-19 23:11:00 +00:00
test.sav	Change: replace per-AI "start_date" with a global "competitors_interval" (#10653)	2023-04-16 20:14:22 +02:00