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 838b166726 Merge branch 'master' into jgrpp ... # Conflicts: # src/cheat_gui.cpp # src/command.cpp # src/command_func.h # src/company_base.h # src/debug.cpp # src/debug.h # src/economy.cpp # src/engine_type.h # src/graph_gui.cpp # src/misc_cmd.cpp # src/misc_cmd.h # src/network/core/os_abstraction.cpp # src/openttd.cpp # src/saveload/saveload.cpp # src/saveload/saveload.h # src/settings_type.h # src/ship_cmd.cpp # src/stdafx.h # src/tests/bitmath_func.cpp # src/town_cmd.cpp # src/town_gui.cpp		4 months ago
..
regression	Merge branch 'master' into jgrpp	4 months ago
stationlist	Change: forcefully enable prefixing logs with date (#11930)	4 months ago
CMakeLists.txt	Change: [CMake] Use explicit list for regression (#11541)	6 months ago
regression.cfg	Codechange: move regression outside of bin and make it work via CMake script	4 years ago