?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: c5ebeb8 4e1efe7)
Merge branch 'master' into 303
commitd22d62e5900d71b7815924554127623184193bf7
authortomrus88 <tomrus88@gmail.com>
Sun, 16 Nov 2008 14:20:43 +0000 (16 17:20 +0300)
committertomrus88 <tomrus88@gmail.com>
Sun, 16 Nov 2008 14:20:43 +0000 (16 17:20 +0300)
tree3a3e14c9cd5dc3f7e1eb5ac3208abc65c21e8944tree | snapshot (tar.gz zip)
parentc5ebeb82dc54eaea5b39039fb5e0b5091bf835b9commit | diff
parent4e1efe728511604511112a6dbfa5b5082f7aff8ecommit | diff
Merge branch 'master' into 303

Conflicts:
src/game/ItemPrototype.h
src/game/ObjectMgr.cpp
src/shared/Database/SQLStorage.cpp
14 files changed:
src/game/Chat.cpp diff1 |  diff2 |  blob | history
src/game/Chat.h diff1 |  diff2 |  blob | history
src/game/Creature.cpp diff1 |  diff2 |  blob | history
src/game/Creature.h diff1 |  diff2 |  blob | history
src/game/GameObject.h diff1 |  diff2 |  blob | history
src/game/ItemPrototype.h diff1 |  diff2 |  blob | history
src/game/Level3.cpp diff1 |  diff2 |  blob | history
src/game/Map.cpp diff1 |  diff2 |  blob | history
src/game/Map.h diff1 |  diff2 |  blob | history
src/game/ObjectMgr.cpp diff1 |  diff2 |  blob | history
src/game/ObjectMgr.h diff1 |  diff2 |  blob | history
src/game/Pet.h diff1 |  diff2 |  blob | history
src/game/World.cpp diff1 |  diff2 |  blob | history
src/shared/Database/SQLStorage.cpp diff1 |  diff2 |  blob | history
MaNGOS is a free, Open Source implementation of a game server compatible with the original World of Warcraft client.