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

Browse Source

Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
	src/server/scripts/Commands/cs_reload.cpp

...

This commit is contained in:

Vincent-Michael

2014-04-25 23:42:40 +02:00

parent 7edfbaeb6e c81d6e9b4b

commit 1390621f4d

66 changed files with 388 additions and 332 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

+2 -2

File diff suppressed because one or more lines are too long