Merge branch 'save_ext' into jgrpp

# Conflicts: # config.lib # src/saveload/extended_ver_sl.cpp # src/saveload/saveload.cpp
2016-09-07 22:02:57 +01:00
parent 315db4874a a3d0fc5817
commit 5e67582a64
39 changed files with 777 additions and 477 deletions
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -1639,6 +1639,10 @@
 				RelativePath=".\..\src\safeguards.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\scope.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\screenshot.h"
 				>