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 ead18b2af2 Merge branch 'master' into jgrpp ... # Conflicts: # CMakeLists.txt # src/3rdparty/md5/md5.h # src/3rdparty/squirrel/squirrel/squtils.h # src/animated_tile.cpp # src/console_func.h # src/core/CMakeLists.txt # src/core/container_func.hpp # src/core/smallstack_type.hpp # src/crashlog.cpp # src/crashlog.h # src/debug.h # src/economy.cpp # src/gamelog.cpp # src/industry_gui.cpp # src/lang/catalan.txt # src/misc_gui.cpp # src/network/network_content.h # src/newgrf.cpp # src/newgrf.h # src/newgrf_config.cpp # src/newgrf_config.h # src/newgrf_gui.cpp # src/os/unix/font_unix.cpp # src/os/windows/crashlog_win.cpp # src/rail_cmd.cpp # src/saveload/animated_tile_sl.cpp # src/script/api/script_tilelist.cpp # src/settings.cpp # src/settingsgen/settingsgen.cpp # src/sl/oldloader_sl.cpp # src/station.cpp # src/station_cmd.cpp # src/stdafx.h # src/strgen/strgen.cpp # src/strgen/strgen_base.cpp # src/table/settings/gui_settings.ini # src/train_gui.cpp # src/vehicle.cpp # src/vehicle_base.h # src/vehicle_cmd.cpp # src/vehicle_gui_base.h # src/viewport_sprite_sorter.h		12 months ago
..
CMakeLists.txt	Merge branch 'master' into jgrpp	12 months ago
crashlog_win.cpp	Merge branch 'master' into jgrpp	12 months ago
font_win32.cpp	Merge branch 'master' into jgrpp	12 months ago
font_win32.h	Codechange: [windows] cache the actually loaded font name	1 year ago
ottdres.rc.in	Change: rebrand 1.12.0 to 12.0	3 years ago
string_uniscribe.cpp	Merge branch 'master' into jgrpp	1 year ago
string_uniscribe.h	Change: include fmt.h C++ headers in stdafx.h	1 year ago
survey_win.cpp	Feature: opt-in survey when exiting a game	1 year ago
win32.cpp	Windows: Add fallback for DoOSAbort implementation	1 year ago
win32.h	Merge branch 'master' into jgrpp	1 year ago