Merge remote-tracking branch 'origin/3.3.5' into 4.3.4

Browse Source

Conflicts:
	sql/base/auth_database.sql
	src/server/game/Instances/InstanceScript.h
	src/server/scripts/Northrend/isle_of_conquest.cpp
	src/server/shared/Database/Implementation/LoginDatabase.cpp
	src/server/shared/Database/Implementation/LoginDatabase.h

...

This commit is contained in:

DDuarte

2014-10-19 00:18:06 +01:00

parent e07d3ebe4e 15a9c6729e

commit 5bf55eacfd

39 changed files with 1593 additions and 419 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

32

sql/base/auth_database.sql

File diff suppressed because one or more lines are too long