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 fdd666f66a Merge tag '14.0-beta1' into jgrpp
# Conflicts:
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/aircraft.h
#	src/animated_tile.h
#	src/base_consist.h
#	src/cargotype.h
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/engine_gui.cpp
#	src/industry_gui.cpp
#	src/lang/english.txt
#	src/music/extmidi.cpp
#	src/network/core/network_game_info.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_industries.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/order_type.h
#	src/os/macosx/misc_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_gui.cpp
#	src/rail_gui.h
#	src/roadveh.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/script/api/script_town.cpp
#	src/settingsgen/settingsgen.cpp
#	src/ship.h
#	src/ship_cmd.cpp
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen.h
#	src/table/settings/script_settings.ini
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_cmd.h
#	src/town_gui.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/waypoint_base.h
#	src/widget.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