| commit | 5a3e2287bad97973ff9fc9fb3c2f15a438054a79 | |
| author | VladimirMangos <vladimir@getmangos.com> | |
| Sun, 25 Jan 2009 03:56:05 +0000 (25 06:56 +0300) | ||
| committer | VladimirMangos <vladimir@getmangos.com> | |
| Sun, 25 Jan 2009 03:56:05 +0000 (25 06:56 +0300) | ||
| tree | 18af0a411b54c5e2013fd41a1f4bda80d0d8fdcb | treesnapshot (tar.gz zip) |
| parent | b0f491c38ea6b0049fc66982483550dadefbd641 | commitdiff |
| parent | b65684d56aa48b5acedc278bfd14f15525447a52 | commitdiff |
Merge commit 'origin/master' into 308
Conflicts:
src/game/ObjectMgr.cpp
src/shared/revision_nr.h
Conflicts:
src/game/ObjectMgr.cpp
src/shared/revision_nr.h
| src/game/Spell.cpp | diff1 | diff2 | blobhistory |
| src/game/SpellEffects.cpp | diff1 | diff2 | blobhistory |