Merge branch 'master' into jgrpp

# Conflicts: # src/string.cpp
2018-06-07 06:49:18 +01:00
parent 55083a0f65 cd966f3810
commit 8e9d68048a
122 changed files with 2335 additions and 397 deletions
--- a/source.list
+++ b/source.list
@@ -373,6 +373,7 @@ string_base.h
 string_func.h
 string_func_extra.h
 string_type.h
+os/windows/string_uniscribe.h
 stringfilter_type.h
 strings_func.h
 strings_type.h
@@ -1221,6 +1222,7 @@ sound/null_s.cpp
 #if WIN32
 	os/windows/crashlog_win.cpp
 	os/windows/ottdres.rc
+	os/windows/string_uniscribe.cpp
 	os/windows/win32.cpp
 #end