Public Git Hosting - getmangos.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 31a9b98 2fe3ff0)

commit	880f3ad10fcd49faace2c85b5e223cecb1638273
author	tomrus88 <tomrus88@gmail.com>
	Sat, 15 Nov 2008 12:35:52 +0000 (15 15:35 +0300)
committer	tomrus88 <tomrus88@gmail.com>
	Sat, 15 Nov 2008 12:35:52 +0000 (15 15:35 +0300)
tree	8462312a38a328310de2c1ca09f035dcfcb2d259	tree \| snapshot (tar.gz zip)
parent	31a9b9815015bbc184c6aa996416677b6a3490d7	commit \| diff
parent	2fe3ff053f5b025e0bc812aec91bd12620b874d1	commit \| diff

Merge branch 'master' into 303

Conflicts:
src/game/CharacterHandler.cpp
src/game/Pet.cpp
src/game/Player.cpp

13 files changed:

src/game/CharacterHandler.cpp	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/MapManager.cpp	diff1 \|	diff2 \|	blob \| history
src/game/ObjectAccessor.cpp	diff1 \|	diff2 \|	blob \| history
src/game/ObjectAccessor.h	diff1 \|	diff2 \|	blob \| history
src/game/ObjectMgr.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Pet.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Player.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Unit.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Unit.h	diff1 \|	diff2 \|	blob \| history
src/game/Vehicle.cpp	diff1 \|	\|	blob \| history

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