Merge branch master into boost

Browse Source

Conflicts:
               BattlegroundMgr.h

...

This commit is contained in:

Subv

2014-07-13 16:52:38 -05:00

parent f14399d788

commit dfdc19f3bc

84 changed files with 2009 additions and 890 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

+4 -4

File diff suppressed because one or more lines are too long