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

Browse Source

Conflicts:
	src/server/game/Accounts/RBAC.h
	src/server/game/Battlegrounds/ArenaTeam.cpp

...

This commit is contained in:

Vincent-Michael

2013-09-11 22:35:45 +02:00

parent 5583bcfeea 38f5c916cf

commit 974bf5c427

26 changed files with 222 additions and 187 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

+68 -31

File diff suppressed because one or more lines are too long