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

2024-02-17 11:53:35 +00:00

..

regression

Merge branch 'master' into jgrpp

2024-02-17 11:53:35 +00:00

stationlist

Change: forcefully enable prefixing logs with date (#11930)

2024-01-30 22:02:16 +00:00

CMakeLists.txt

Change: [CMake] Use explicit list for regression (#11541)

2023-12-05 15:37:53 +01:00

regression.cfg

Codechange: move regression outside of bin and make it work via CMake script

2020-06-05 19:36:05 +02:00