mirror of
https://github.com/mangosfour/server.git
synced 2025-12-26 16:37:06 +00:00
Merge remote branch 'origin/master' into 330
Conflicts: src/game/Player.cpp src/game/PlayerDump.cpp
This commit is contained in:
commit
086e9fa1ce
45 changed files with 616 additions and 422 deletions
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __REVISION_NR_H__
|
||||
#define __REVISION_NR_H__
|
||||
#define REVISION_NR "9565"
|
||||
#define REVISION_NR "9578"
|
||||
#endif // __REVISION_NR_H__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue