mirror of
https://github.com/mangosfour/server.git
synced 2025-12-27 19:37:04 +00:00
Merge commit 'origin/master' into 320
Conflicts: sql/updates/8098_01_characters_character_action.sql sql/updates/8098_02_mangos_playercreateinfo_action.sql src/game/Player.cpp src/game/Player.h src/game/SpellEffects.cpp src/shared/revision_nr.h
This commit is contained in:
commit
62327e7af0
4 changed files with 4 additions and 6 deletions
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __REVISION_NR_H__
|
||||
#define __REVISION_NR_H__
|
||||
#define REVISION_NR "8106"
|
||||
#define REVISION_NR "8107"
|
||||
#endif // __REVISION_NR_H__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue