Commit Graph

2 Commits (6297abdb3bff8f4d21e1d07dad249f8d67688b58)

Author SHA1 Message Date
Jonathan G Rennison 6091d7470c Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/release-macos.yml
#	src/company_gui.cpp
#	src/linkgraph/linkgraph.cpp
#	src/newgrf_debug_gui.cpp
#	src/strgen/strgen_base.cpp
#	src/timetable_gui.cpp
1 year ago
Jonathan G Rennison 2829a6fdf7 strgen: Split non-upstream translated strings into separate file 1 year ago