Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Spells/SpellMgr.cpp
This commit is contained in:
Vincent_Michael committed 2013-02-28 22:14:48 +01:00
2 parents 47d7c3a6ad d069e1b6b4
commit b2d05c9cdd
30 files changed
+2656 -874
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/shared/Common.h
+1 -1
View File
@@ -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