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

Browse Source

Conflicts:
	sql/base/auth_database.sql
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/World/World.cpp

...

This commit is contained in:

Vincent-Michael

2014-07-09 21:09:47 +02:00

parent c8eb69df10 b78d0a1c6d

commit 79062dd5ae

19 changed files with 280 additions and 264 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