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 281d346fe2 Merge branch 'master' into jgrpp ... # Conflicts: # bin/baseset/no_sound.obs # bin/baseset/orig_dos.obg # bin/baseset/orig_dos.obs # bin/baseset/orig_dos_de.obg # bin/baseset/orig_win.obg # bin/baseset/orig_win.obm # bin/baseset/orig_win.obs # src/aircraft_cmd.cpp # src/blitter/32bpp_anim.cpp # src/blitter/32bpp_anim.hpp # src/blitter/32bpp_base.cpp # src/blitter/32bpp_base.hpp # src/blitter/8bpp_base.cpp # src/blitter/8bpp_base.hpp # src/blitter/common.hpp # src/group_gui.cpp # src/lang/korean.txt # src/linkgraph/linkgraph_gui.cpp # src/saveload/saveload.cpp # src/town_cmd.cpp # src/viewport.cpp # src/viewport_func.h		6 years ago
..
afterload.cpp	Refactor CallVehicleTicks vehicle loop	6 years ago
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	…
depot_sl.cpp	…
economy_sl.cpp	…
engine_sl.cpp	…
extended_ver_sl.cpp	Merge remote-tracking branch 'damfr/save-unique-id' into jgrpp	6 years ago
extended_ver_sl.h	Merge remote-tracking branch 'damfr/save-unique-id' into jgrpp	6 years ago
game_sl.cpp	…
gamelog_sl.cpp	…
goal_sl.cpp	…
group_sl.cpp	…
industry_sl.cpp	…
labelmaps_sl.cpp	…
linkgraph_sl.cpp	…
map_sl.cpp	…
misc_sl.cpp	…
newgrf_sl.cpp	…
newgrf_sl.h	…
object_sl.cpp	…
oldloader.cpp	…
oldloader.h	…
oldloader_sl.cpp	…
order_sl.cpp	…
plans_sl.cpp	…
saveload.cpp	Merge branch 'master' into jgrpp	6 years ago
saveload.h	Merge branch 'save_ext' into jgrpp	6 years ago
saveload_buffer.h	…
saveload_filter.h	…
saveload_internal.h	…
signal_sl.cpp	…
signs_sl.cpp	…
station_sl.cpp	Merge branch 'save_ext' into jgrpp	6 years ago
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	…
tunnel_sl.cpp	…
vehicle_sl.cpp	Merge branch 'master' into jgrpp	6 years ago
waypoint_sl.cpp	…