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/saveload
Jonathan G Rennison ead18b2af2 Merge branch 'master' into jgrpp
# Conflicts:
#	CMakeLists.txt
#	src/3rdparty/md5/md5.h
#	src/3rdparty/squirrel/squirrel/squtils.h
#	src/animated_tile.cpp
#	src/console_func.h
#	src/core/CMakeLists.txt
#	src/core/container_func.hpp
#	src/core/smallstack_type.hpp
#	src/crashlog.cpp
#	src/crashlog.h
#	src/debug.h
#	src/economy.cpp
#	src/gamelog.cpp
#	src/industry_gui.cpp
#	src/lang/catalan.txt
#	src/misc_gui.cpp
#	src/network/network_content.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/newgrf_gui.cpp
#	src/os/unix/font_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_cmd.cpp
#	src/saveload/animated_tile_sl.cpp
#	src/script/api/script_tilelist.cpp
#	src/settings.cpp
#	src/settingsgen/settingsgen.cpp
#	src/sl/oldloader_sl.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen_base.cpp
#	src/table/settings/gui_settings.ini
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui_base.h
#	src/viewport_sprite_sorter.h
11 months ago
..
compat Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
CMakeLists.txt Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
afterload.cpp Merge branch 'master' into jgrpp 11 months ago
ai_sl.cpp Merge branch 'master' into jgrpp 11 months ago
airport_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
animated_tile_sl.cpp Merge branch 'master' into jgrpp 11 months ago
autoreplace_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
cargomonitor_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
cargopacket_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
cheat_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
company_sl.cpp Merge branch 'master' into jgrpp 11 months ago
depot_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
economy_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
engine_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
game_sl.cpp Merge branch 'master' into jgrpp 11 months ago
gamelog_sl.cpp Merge branch 'master' into jgrpp 11 months ago
goal_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
group_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
industry_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
labelmaps_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
league_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
linkgraph_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
map_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
misc_sl.cpp Merge branch 'master' into jgrpp 11 months ago
newgrf_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
newgrf_sl.h Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
object_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
order_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
saveload.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
saveload.h Merge branch 'master' into jgrpp 11 months ago
settings_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
signs_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
station_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
storage_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
story_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
subsidy_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
town_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
vehicle_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago