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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	CMakeLists.txt
#	src/bootstrap_gui.cpp
This commit is contained in:
Jonathan G Rennison
2020-12-07 17:56:44 +00:00
parent ba11cd59af dddf885fb4
commit 4da3cfcf56
19 changed files with 94 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/landscape.html
View File

@@ -829,7 +829,7 @@
<tr>
<td align=left><tt>4</tt>&nbsp; </td>
<td>on snow with rough land underneed</td>
<td>on snow with rough land underneath</td>
</tr>
</table>
</li>