Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 6.x

Browse Source

Conflicts:
	dep/PackageList.txt
	src/server/bnetserver/Packets/WoWRealmPackets.cpp
	src/server/bnetserver/Server/Session.cpp

...

This commit is contained in:

Shauren

2014-10-18 17:03:30 +02:00

parent 3ee9961ecc 4a0be2bffc

commit 8936723291

245 changed files with 10964 additions and 1308 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

1075

src/server/bnetserver/Server/Session.cpp Normal file

File diff suppressed because it is too large Load Diff