OpenTTD-patches/src/tests
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
..
bitmath_func.cpp Merge branch 'master' into jgrpp 2024-02-17 11:53:35 +00:00
CMakeLists.txt Codechange: Simplify SetBitIterator 2024-02-01 23:05:57 +01:00
landscape_partial_pixel_z.cpp
math_func.cpp
mock_environment.h
mock_fontcache.h
mock_spritecache.cpp
mock_spritecache.h
ring_buffer.cpp
string_func.cpp Merge branch 'master' into jgrpp 2024-02-15 23:49:11 +00:00
strings_func.cpp
test_main.cpp
test_script_admin.cpp
test_window_desc.cpp