Merge branch 'master' into MoreLanguages

Browse Source

# Conflicts:
#	src/core/Frontend.cpp
#	src/render/Font.cpp
#	src/render/Hud.cpp
#	src/render/Hud.h
#	src/text/Messages.cpp
#	src/text/Text.cpp

...

This commit is contained in:

Sergeanur

2020-04-15 00:10:50 +03:00

parent c9ace44ca8 6d934892ec

commit e373d0526e

161 changed files with 26998 additions and 12336 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

3043

src/core/Frontend.cpp

File diff suppressed because it is too large Load Diff