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/source.list
+++ b/source.list
@@ -332,6 +332,7 @@ road_type.h
 roadstop_base.h
 roadveh.h
 safeguards.h
+scope.h
 screenshot.h
 sdl.h
 sound/sdl_s.h