Merge branch 'save_ext' into progsig-sx

Conflicts:
	source.list
	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2015-08-01 17:21:38 +01:00
21 changed files with 981 additions and 176 deletions

View File

@@ -637,6 +637,8 @@ saveload/town_sl.cpp
saveload/vehicle_sl.cpp
saveload/waypoint_sl.cpp
saveload/signal_sl.cpp
saveload/extended_ver_sl.h
saveload/extended_ver_sl.cpp
# Tables
table/airport_defaults.h