mirror of
https://github.com/mangosfour/server.git
synced 2025-12-25 22:37:04 +00:00
Merge branch 'master' into 303
Conflicts: src/game/Corpse.cpp src/game/DynamicObject.cpp src/game/GameObject.cpp src/game/Object.h src/game/Unit.cpp src/game/Unit.h
This commit is contained in:
commit
af1e1d7794
13 changed files with 34 additions and 27 deletions
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __REVISION_NR_H__
|
||||
#define __REVISION_NR_H__
|
||||
#define REVISION_NR "6870"
|
||||
#define REVISION_NR "6873"
|
||||
#endif // __REVISION_NR_H__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue