Merge branch 'master' into jgrpp

Browse Source

# Conflicts:
#	.gitignore
#	CMakeLists.txt
#	src/3rdparty/optional/optional.hpp
#	src/group_cmd.cpp
#	src/industry_cmd.cpp
#	src/misc_gui.cpp
#	src/video/sdl2_v.cpp

...

This commit is contained in:

Jonathan G Rennison

2021-01-29 17:45:15 +00:00

parent 4e0804b791 f7b8e7e46c

commit 43980639de

68 changed files with 2084 additions and 1978 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

1150

src/table/townname.h

File diff suppressed because it is too large Load Diff