Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

Browse Source

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

...

This commit is contained in:

QAston

2011-07-13 17:22:04 +02:00

parent 20e8c25b48 e9e50c4937

commit 5b1d170272

4 changed files with 716 additions and 729 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

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

+705 -720

File diff suppressed because it is too large Load Diff