Merge branch 'save_ext' into infrastructure_sharing-sx

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

View File

@@ -2775,6 +2775,14 @@
RelativePath=".\..\src\saveload\waypoint_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\extended_ver_sl.h"
>
</File>
<File
RelativePath=".\..\src\saveload\extended_ver_sl.cpp"
>
</File>
</Filter>
<Filter
Name="Tables"