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 828d2146eb Merge branch 'master' into jgrpp ... # Conflicts: # CMakeLists.txt # bin/ai/CMakeLists.txt # bin/game/CMakeLists.txt # src/ai/ai_info.cpp # src/company_base.h # src/economy.cpp # src/game/game_info.cpp # src/gfx_type.h # src/linkgraph/linkgraph_gui.cpp # src/palette.cpp # src/palette_func.h # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/ship_cmd.cpp # src/train_cmd.cpp # src/vehicle_base.h # src/window.cpp # src/window_func.h		3 months ago
..
CMakeLists.txt	…
ai_sl.cpp	…
airport_sl.cpp	…
animated_tile_sl.cpp	…
autoreplace_sl.cpp	…
bridge_signal_sl.cpp	…
cargomonitor_sl.cpp	…
cargopacket_sl.cpp	…
cheat_sl.cpp	…
company_sl.cpp	…
debug_sl.cpp	…
depot_sl.cpp	…
economy_sl.cpp	…
engine_sl.cpp	…
extended_ver_sl.cpp	…
extended_ver_sl.h	…
game_sl.cpp	…
gamelog_sl.cpp	…
goal_sl.cpp	…
group_sl.cpp	…
industry_sl.cpp	…
labelmaps_sl.cpp	…
league_sl.cpp	…
linkgraph_sl.cpp	…
map_sl.cpp	…
misc_sl.cpp	…
newgrf_sl.cpp	…
newgrf_sl.h	…
newsignals_sl.cpp	…
object_sl.cpp	…
oldloader.cpp	…
oldloader.h	…
oldloader_sl.cpp	…
order_sl.cpp	…
plans_sl.cpp	…
saveload.cpp	…
saveload.h	…
saveload_buffer.h	…
saveload_common.h	Merge branch 'master' into jgrpp	3 months ago
saveload_filter.h	…
saveload_internal.h	…
saveload_types.h	…
signal_sl.cpp	…
signs_sl.cpp	…
station_sl.cpp	…
storage_sl.cpp	…
story_sl.cpp	…
strings_sl.cpp	…
subsidy_sl.cpp	…
tbtr_template_replacement_sl.cpp	…
tbtr_template_veh_sl.cpp	…
town_sl.cpp	…
tracerestrict_sl.cpp	…
train_speed_adaptation.cpp	…
tunnel_sl.cpp	…
vehicle_sl.cpp	…
waypoint_sl.cpp	…