mirror of
https://github.com/mangosfour/server.git
synced 2025-12-30 19:37:04 +00:00
Merge remote branch 'origin/master' into 330
Conflicts: src/game/Player.cpp
This commit is contained in:
commit
112046718a
25 changed files with 120 additions and 157 deletions
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __REVISION_NR_H__
|
||||
#define __REVISION_NR_H__
|
||||
#define REVISION_NR "9619"
|
||||
#define REVISION_NR "9627"
|
||||
#endif // __REVISION_NR_H__
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#ifndef __REVISION_SQL_H__
|
||||
#define __REVISION_SQL_H__
|
||||
#define REVISION_DB_CHARACTERS "required_9611_01_characters"
|
||||
#define REVISION_DB_MANGOS "required_9590_01_mangos_db_script_string"
|
||||
#define REVISION_DB_MANGOS "required_9622_01_mangos_gameobject"
|
||||
#define REVISION_DB_REALMD "required_9010_01_realmd_realmlist"
|
||||
#endif // __REVISION_SQL_H__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue