Jonathan G Rennison 27c06f9737 Merge branch 'master' into jgrpp ... # Conflicts: # src/build_vehicle_gui.cpp # src/disaster_vehicle.cpp # src/music/dmusic.cpp # src/newgrf.cpp # src/newgrf.h # src/newgrf_spritegroup.h # src/os/windows/crashlog_win.cpp # src/os/windows/win32.cpp # src/saveload/saveload.cpp # src/saveload/settings_sl.cpp # src/settings_table.cpp # src/stdafx.h # src/strgen/strgen.cpp # src/string.cpp # src/string_func.h # src/table/newgrf_debug_data.h # src/town_cmd.cpp # src/train_cmd.cpp # src/video/win32_v.cpp		2024-09-18 18:07:23 +01:00
..
CMakeLists.txt
game_config.cpp
game_config.hpp
game_core.cpp
game_gui.cpp	Merge branch 'master' into jgrpp	2024-09-18 18:07:23 +01:00
game_gui.hpp
game_info.cpp
game_info.hpp
game_instance.cpp
game_instance.hpp
game_scanner.cpp
game_scanner.hpp
game_text.cpp	Fix crash in GetGameStringPtr when there are no GS strings	2024-09-08 02:22:01 +01:00
game_text.hpp
game.hpp