You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		2 months ago
..
CMakeLists.txt	Change: [CMake] Use explicit list for regression (#11541)	5 months ago
info.nut	Codechange: We are heading to 15	2 months ago
main.nut	Merge branch 'master' into jgrpp	2 months ago
require.nut	Codechange: move regression outside of bin and make it work via CMake script	4 years ago
result.txt	Merge branch 'master' into jgrpp	2 months ago
test.sav	Change: replace per-AI "start_date" with a global "competitors_interval" (#10653)	1 year ago