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

Browse Source

Conflicts:
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp

...

This commit is contained in:

Subv committed 2012-10-04 19:39:09 -05:00

2 parents d2437407f4 74707a08d3

commit f7d3600e7e

128 files changed

+2862 -2459

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

No files matched your search

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

+168 -168

File diff suppressed because it is too large. Load diff