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

Merge branch 'master' into jgrpp-beta

Browse Source 
# Conflicts:
#	.github/workflows/ci-build.yml
#	src/lang/german.txt
#	src/lang/romanian.txt
#	src/lang/slovak.txt
#	src/lang/turkish.txt
#	src/network/core/address.cpp
#	src/network/core/tcp.h
#	src/network/core/udp.cpp
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/saveload/newgrf_sl.cpp
#	src/tree_cmd.cpp
#	src/video/video_driver.hpp
#	src/window.cpp
#	src/window_gui.h
This commit is contained in:
Jonathan G Rennison
2021-09-22 21:49:32 +01:00
parent da1ac73c02 86741ad489
commit 0b0d154788
76 changed files with 1226 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/table/townname.h
View File

@@ -1390,7 +1390,7 @@ static const char * const _name_polish_2_o[] = {
"Zakopane",
u8"Szklarska Por\u0119ba",
"Bochnia",
"Golub-Dobrzyn",
u8"Golub-Dobrzy\u0144",
"Chojnice",
"Ostrowiec",
"Otwock",
@@ -1484,7 +1484,7 @@ static const char * const _name_polish_2_n[] = {
"Pilzno",
"Przodkowo",
"Strzelno",
"Susz",
"Leszno",
"Jaworzno",
"Choszczno",
"Mogilno",