?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 3a3dbc1 ea34fa4)
Merge branch 'master' into 303
commitfbb93541382227319217bfa67a45acfb4b13cd33
authortomrus88 <tomrus88@gmail.com>
Fri, 28 Nov 2008 04:20:02 +0000 (28 07:20 +0300)
committertomrus88 <tomrus88@gmail.com>
Fri, 28 Nov 2008 04:20:02 +0000 (28 07:20 +0300)
tree245a6deeadb1d54830a10a7096a8fed27404d75dtree | snapshot (tar.gz zip)
parent3a3dbc124e3593ad745a88f4d17384d9abe14a03commit | diff
parentea34fa452f017bc65caad08032dc16bbabeb9016commit | diff
Merge branch 'master' into 303

Conflicts:
src/shared/Database/DBCStores.cpp
src/shared/Database/DBCfmt.cpp
src/game/ObjectMgr.cpp diff1 |  diff2 |  blob | history
src/game/PetHandler.cpp diff1 |  diff2 |  blob | history
src/game/Player.cpp diff1 |  diff2 |  blob | history
src/game/Player.h diff1 |  diff2 |  blob | history
src/game/SpellEffects.cpp diff1 |  diff2 |  blob | history
src/shared/Database/DBCStores.cpp diff1 |  diff2 |  blob | history
src/shared/Database/DBCStores.h diff1 |  diff2 |  blob | history
src/shared/Database/DBCStructure.h diff1 |  diff2 |  blob | history
src/shared/Database/DBCfmt.cpp diff1 |  diff2 |  blob | history
MaNGOS is a free, Open Source implementation of a game server compatible with the original World of Warcraft client.