Merge branch 'save_ext' into enhanced_viewport_overlay

# Conflicts: # src/smallmap_gui.cpp
2017-09-04 01:04:04 +01:00
parent d3a1e8060d 19e62d089f
commit 2574e46df8
265 changed files with 4275 additions and 2654 deletions
--- a/source.list
+++ b/source.list
@@ -349,6 +349,7 @@ story_type.h
 strgen/strgen.h
 string_base.h
 string_func.h
+string_func_extra.h
 string_type.h
 stringfilter_type.h
 strings_func.h
@@ -429,6 +430,7 @@ core/backup_type.hpp
 core/bitmath_func.cpp
 core/bitmath_func.hpp
 core/container_func.hpp
+core/dyn_arena_alloc.hpp
 core/endian_func.hpp
 core/endian_type.hpp
 core/enum_type.hpp