Merge branch 'cpp-11' into signal_tunnels_bridges

# Conflicts: # src/saveload/saveload.cpp
2016-09-11 13:16:54 +01:00
parent 22f9e3b97c ea2b04a6be
commit 888cd1be07
194 changed files with 9855 additions and 2966 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
@@ -422,6 +423,7 @@ core/alloc_type.hpp
 core/backup_type.hpp
 core/bitmath_func.cpp
 core/bitmath_func.hpp
+core/container_func.hpp
 core/endian_func.hpp
 core/endian_type.hpp
 core/enum_type.hpp