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

Browse Source

Conflicts:
	src/server/game/Accounts/RBAC.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Server/Protocol/Opcodes.cpp

...

This commit is contained in:

Vincent_Michael

2014-01-19 20:52:16 +01:00

parent 93a97a9922 313b294d6b

commit 7e527f9075

20 changed files with 220 additions and 80 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