Merge branch 'save_ext' into tracerestrict-sx

# Conflicts: # src/rail_gui.cpp # src/saveload/extended_ver_sl.cpp
2016-09-05 23:33:33 +01:00
parent 8482fc6aef a3d0fc5817
commit 162e495cc9
187 changed files with 7343 additions and 1311 deletions
--- a/source.list
+++ b/source.list
@@ -310,6 +310,7 @@ road_type.h
 roadstop_base.h
 roadveh.h
 safeguards.h
+scope.h
 screenshot.h
 sdl.h
 sound/sdl_s.h