Merge branch 'save_ext' into enhanced_viewport_overlay-sx

Conflicts:
	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2015-08-05 21:31:57 +01:00
21 changed files with 981 additions and 175 deletions

View File

@@ -642,6 +642,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