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

Browse Source

Conflicts:
	sql/base/auth_database.sql
	src/server/scripts/EasternKingdoms/CMakeLists.txt

...

This commit is contained in:

Vincent-Michael

2014-07-09 10:23:14 +02:00

parent e5306b973f bb8922a5e4

commit 6a6403a54e

12 changed files with 199 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

6

sql/base/auth_database.sql

File diff suppressed because one or more lines are too long