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

Browse Source

Conflicts:
	sql/base/auth_database.sql
	src/server/game/Entities/Player/Player.cpp

...

This commit is contained in:

Vincent-Michael

2014-08-29 06:24:08 +02:00

parent fea1fdc854 662ab6d3b9

commit 9cb92f93aa

24 changed files with 1783 additions and 71 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

sql/base/auth_database.sql

+5 -5

File diff suppressed because one or more lines are too long