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 23b974fb39 Merge branch 'master' into jgrpp ... # Conflicts: # src/fontcache.cpp # src/openttd.cpp # src/os/macosx/font_osx.cpp # src/os/unix/font_unix.cpp # src/os/windows/font_win32.cpp # src/strings.cpp		2 years ago
..
CMakeLists.txt	…
company_settings.ini	Remove tunnel/bridge spacing setting, use usual signal drag spacing	2 years ago
currency_settings.ini	…
gameopt_settings.ini	…
misc_settings.ini	Merge branch 'master' into jgrpp	2 years ago
network_private_settings.ini	…
network_secrets_settings.ini	…
network_settings.ini	…
settings.ini	Add setting to show group hierarchy in vehicle names	2 years ago
win32_settings.ini	…
window_settings.ini	…