Public Git Hosting - getmangos.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: e2c92a3 1a5426f)

commit	37319dc0a0125a6e03e7bfa91e0b59723a975f15
author	tomrus88 <tomrus88@gmail.com>
	Sun, 30 Nov 2008 11:05:56 +0000 (30 14:05 +0300)
committer	tomrus88 <tomrus88@gmail.com>
	Sun, 30 Nov 2008 11:05:56 +0000 (30 14:05 +0300)
tree	d0ea10158492c5f818275aa0a73f4bb7bded2dad	tree \| snapshot (tar.gz zip)
parent	e2c92a32a98511f25300cb28d81f8167d5e57cef	commit \| diff
parent	1a5426fdd33a9545735862c77312888621fea014	commit \| diff

Merge branch 'master' into 303

Conflicts:
src/game/Player.cpp
src/mangosd/mangosd.conf.dist.in

14 files changed:

src/game/BattleGround.cpp	diff1 \|	diff2 \|	blob \| history
src/game/CharacterHandler.cpp	diff1 \|	diff2 \|	blob \| history
src/game/MiscHandler.cpp	diff1 \|	diff2 \|	blob \| history
src/game/ObjectMgr.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Player.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Player.h	diff1 \|	diff2 \|	blob \| history
src/game/Spell.cpp	diff1 \|	diff2 \|	blob \| history
src/game/SpellMgr.cpp	diff1 \|	diff2 \|	blob \| history
src/game/WaypointMovementGenerator.cpp	diff1 \|	diff2 \|	blob \| history
src/game/World.cpp	diff1 \|	diff2 \|	blob \| history
src/game/World.h	diff1 \|	diff2 \|	blob \| history
src/game/WorldSession.cpp	diff1 \|	diff2 \|	blob \| history
src/game/WorldSession.h	diff1 \|	diff2 \|	blob \| history
src/mangosd/mangosd.conf.dist.in	diff1 \|	diff2 \|	blob \| history

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