mirror of
https://github.com/mangosfour/server.git
synced 2025-12-27 19:37:04 +00:00
Merge branch 'master' into 310
Conflicts: src/game/GameObject.h src/game/MiscHandler.cpp src/game/Player.cpp src/game/QueryHandler.cpp src/game/QuestHandler.cpp src/game/SkillHandler.cpp src/game/SpellAuras.cpp src/game/SpellEffects.cpp src/game/Unit.cpp src/game/WorldSession.h
This commit is contained in:
commit
e454cb693d
8 changed files with 244 additions and 234 deletions
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __REVISION_NR_H__
|
||||
#define __REVISION_NR_H__
|
||||
#define REVISION_NR "7910"
|
||||
#define REVISION_NR "7911"
|
||||
#endif // __REVISION_NR_H__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue