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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2024-03-01 23:36:16 +00:00
parent cb5c6abc00 a602845d0a
commit b04a356f53
12 changed files with 326 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/misc_gui.cpp
View File

@@ -455,7 +455,7 @@ static const char * const _credits[] = {
" Peter Nelson (peter1138) - Spiritual descendant from NewGRF gods (since 0.4.5)",
" Remko Bijker (Rubidium) - Coder and way more (since 0.4.5)",
" Patric Stout (TrueBrain) - NoProgrammer (since 0.3), sys op",
" Tyler Trahan (2TallTyler) - General coding (since 13)",
" Tyler Trahan (2TallTyler) - General / Time Lord (since 13)",
"",
"Inactive Developers:",
" Grzegorz Duczy\u0144ski (adf88) - General coding (1.7 - 1.8)",