Merge branch 'save_ext' into tracerestrict-sx

Conflicts:
	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2015-08-01 13:03:01 +01:00
17 changed files with 957 additions and 176 deletions

View File

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