dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into save_ext

Browse Source 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/table/settings.h.preamble
This commit is contained in:
Jonathan G Rennison
2018-07-02 18:41:39 +01:00
parent a3156804c5 8f278b3405
commit 373ff3dd4e
171 changed files with 3349 additions and 1011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source.list
View File

@@ -345,6 +345,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
@@ -1173,6 +1174,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