Public Git Hosting - getmangos.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 7692209 4164db7)

commit	a1699ab769419e04ce6f0ac06bce1265efa904e8
author	tomrus88 <tomrus88@gmail.com>
	Thu, 28 May 2009 06:16:02 +0000 (28 10:16 +0400)
committer	tomrus88 <tomrus88@gmail.com>
	Thu, 28 May 2009 06:16:02 +0000 (28 10:16 +0400)
tree	ba10d2278cbfc316c804eb36c78ecf09c1cccede	tree \| snapshot (tar.gz zip)
parent	7692209fbe6fa08cd7aa44d80ac45bb727108e4b	commit \| diff
parent	4164db7a9d1320564a2f007320720f454b1743a4	commit \| diff

Merge branch 'master' into 310

Conflicts:
src/game/Player.cpp

15 files changed:

sql/mangos.sql	diff1 \|	diff2 \|	blob \| history
src/game/Creature.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Creature.h	diff1 \|	diff2 \|	blob \| history
src/game/Item.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Item.h	diff1 \|	diff2 \|	blob \| history
src/game/ItemPrototype.h	diff1 \|	diff2 \|	blob \| history
src/game/Mail.cpp	diff1 \|	diff2 \|	blob \| history
src/game/ObjectMgr.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Pet.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/SharedDefines.h	diff1 \|	diff2 \|	blob \| history
src/game/Unit.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Unit.h	diff1 \|	diff2 \|	blob \| history

MaNGOS is a free, Open Source implementation of a game server compatible with the original World of Warcraft client.