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.
OpenTTD-patches/src/table/settings
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 Split save/load settings into separate INI files 7 months ago
company_settings.ini Merge branch 'master' into jgrpp 4 months ago
currency_settings.ini Merge branch 'master' into jgrpp 4 months ago
difficulty_settings.ini Merge branch 'master' into jgrpp 4 months ago
economy_settings.ini Disable settings inapplicable for the current timekeeping mode 4 months ago
game_settings.ini Merge branch 'master' into jgrpp 4 months ago
gui_settings.ini Merge branch 'master' into jgrpp 4 months ago
linkgraph_settings.ini Merge branch 'master' into jgrpp 4 months ago
locale_settings.ini Merge branch 'master' into jgrpp 4 months ago
misc_settings.ini Merge branch 'master' into jgrpp 4 months ago
multimedia_settings.ini Merge branch 'master' into jgrpp 4 months ago
network_private_settings.ini Merge branch 'master' into jgrpp 4 months ago
network_secrets_settings.ini Settings: Only write out config on setting change for persistent changes 10 months ago
network_settings.ini Merge branch 'master' into jgrpp 4 months ago
news_display_settings.ini Merge branch 'master' into jgrpp 4 months ago
old_gameopt_settings.ini Merge branch 'master' into jgrpp 4 months ago
pathfinding_settings.ini Merge branch 'master' into jgrpp 4 months ago
scenario_settings.ini Merge branch 'master' into jgrpp 4 months ago
script_settings.ini Merge branch 'master' into jgrpp 4 months ago
win32_settings.ini Merge branch 'master' into jgrpp 4 months ago
window_settings.ini Merge branch 'master' into jgrpp 4 months ago
world_settings.ini Merge branch 'master' into jgrpp 4 months ago