Merge tag '1.11.0-beta1' into jgrpp

Browse Source

# Conflicts:
#	src/console_cmds.cpp
#	src/gfx_func.h
#	src/industry.h
#	src/lang/czech.txt
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/slovak.txt
#	src/saveload/saveload.h
#	src/station_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/waypoint_gui.cpp

...

This commit is contained in:

Jonathan G Rennison

2021-02-01 18:58:36 +00:00

parent 61e7b8c52a a252679a12

commit 7154f8859d

130 changed files with 1579 additions and 1104 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

docs/palettes/palette_key.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.8 KiB