Merge branch 'save_ext' into tracerestrict-sx

# Conflicts: # src/vehiclelist.cpp
2017-08-15 19:28:30 +01:00
parent 58a860c087 258e591f71
commit ba33754993
92 changed files with 973 additions and 507 deletions
--- a/source.list
+++ b/source.list
@@ -344,6 +344,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