diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-28 22:14:48 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-28 22:14:48 +0100 |
| commit | b2d05c9cdd19abf005f249ace7f59d2c4fc2bbf1 (patch) | |
| tree | 72b2717bf2a10cf86fc49f99ffde2bcd0100f708 /src/server/shared/Common.h | |
| parent | 47d7c3a6adbc9f11066a26136bbad440ee3c8641 (diff) | |
| parent | d069e1b6b4d9f839df1a823d0ec1ddfa6dea303c (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Player/Player.h
src/server/game/Spells/SpellMgr.cpp
Diffstat (limited to 'src/server/shared/Common.h')
| -rw-r--r-- | src/server/shared/Common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h index f4e4ce7fe06..44a7749334d 100644 --- a/src/server/shared/Common.h +++ b/src/server/shared/Common.h @@ -170,7 +170,7 @@ enum LocaleConstant }; const uint8 TOTAL_LOCALES = 9; -const LocaleConstant DEFAULT_LOCALE = LOCALE_enUS; +#define DEFAULT_LOCALE LOCALE_enUS #define MAX_LOCALES 8 #define MAX_ACCOUNT_TUTORIAL_VALUES 8 |