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 a98a56669b Merge branch 'master' into jgrpp
# Conflicts:
#	regression/regression/result.txt
#	src/autoreplace_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/network/network_content.cpp
#	src/newgrf_roadstop.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/road_gui.cpp
#	src/saveload/ai_sl.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/station.cpp
#	src/station_gui.cpp
#	src/video/cocoa/cocoa_ogl.h
#	src/video/sdl2_opengl_v.h
#	src/video/video_driver.hpp
#	src/video/win32_v.h
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
#	src/window.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 tag '14.0-beta1' 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 tag '14.0-beta1' 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