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

Merge branch 'cpp-11' into crashlog_improvements

Browse Source 
# Conflicts:
#	src/stdafx.h
This commit is contained in:
Jonathan G Rennison
2016-09-08 19:36:00 +01:00
parent 62631cba02 8a2f9311a9
commit f7774415f2
181 changed files with 7194 additions and 1233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.src.in
View File

@@ -214,7 +214,7 @@ endif
{ \
print $$0 \
} \
' < Makefile.dep.tmp | sed 's@ *@ @g;s@ $$@@' | $(SORT) > Makefile.dep
' < Makefile.dep.tmp | sed 's@ *@ @g;s@ $$@@' | LC_ALL=C $(SORT) > Makefile.dep
$(Q)rm -f Makefile.dep.tmp Makefile.dep.tmp.bak