Merge branch 'master' into jgrpp

Browse Source

# Conflicts:
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/saveload.cpp
#	src/widgets/group_widget.h

...

This commit is contained in:

Jonathan G Rennison

2019-01-31 18:19:45 +00:00

parent c41463b259 23960d0f2c

commit ddf31702a2

24 changed files with 573 additions and 149 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

bin/baseset/openttd.grf

Binary file not shown.