Merge remote-tracking branch 'upstream/develop' into loading-bar

Browse Source

# Conflicts:
#	server/CGameHandler.h

...

This commit is contained in:

nordsoft

2023-08-22 00:46:54 +04:00

parent 4cf28fe00e 78780bb20c

commit dbc3a93013

61 changed files with 4660 additions and 3901 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

2810

server/CGameHandler.cpp

File diff suppressed because it is too large Load Diff