Merge branch 'save_ext' into infrastructure_sharing-sx

Conflicts: src/saveload/saveload.cpp
2015-08-06 23:01:01 +01:00
parent a4ad4130a6 03b6c41c67
commit 037cce3b38
21 changed files with 981 additions and 175 deletions
--- a/source.list
+++ b/source.list
@@ -635,6 +635,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