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
..
CMakeLists.txt	Codechange: refactor the Windows-only DllLoader in a cross-platform LibraryLoader (#11751)	5 months ago
crashlog_win.cpp	Add console command to get version information	4 months ago
font_win32.cpp	Merge branch 'master' into jgrpp	5 months ago
font_win32.h	Feature: Scalable OpenTTD TrueType font made by Zephyris.	5 months ago
library_loader_win.cpp	Merge branch 'master' into jgrpp	4 months ago
ottdres.rc.in	Merge branch 'master' into jgrpp	7 months ago
string_uniscribe.cpp	Merge branch 'master' into jgrpp	5 months ago
string_uniscribe.h	Merge branch 'master' into jgrpp	7 months ago
survey_win.cpp	MinGW: Remove direct mingw-std-threads includes	6 months ago
win32.cpp	Rename ShowInfo to ShowInfoI, add ShowInfo fmt macro	5 months ago
win32.h	Merge branch 'master' into jgrpp	5 months ago
win32_main.cpp	Test: Add upstream tests	6 months ago