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

Browse Source

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp

...

This commit is contained in:

Vincent-Michael committed 2014-04-07 20:42:44 +02:00

2 parents 19751f36f6 b717ce0eda

commit 1f7260ca4b

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

Diff Content Not Available