Public Git Hosting - getmangos.git/commit

Merge branch 'master' into 303

Conflicts:
src/game/Player.cpp
src/game/Spell.cpp

24 files changed:

src/game/Creature.cpp	diff1 \|	diff2 \|	blob \| history
src/game/GameObject.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Group.h	diff1 \|	diff2 \|	blob \| history
src/game/Guild.h	diff1 \|	diff2 \|	blob \| history
src/game/Level3.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Mail.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Map.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Map.h	diff1 \|	diff2 \|	blob \| history
src/game/MiscHandler.cpp	diff1 \|	diff2 \|	blob \| history
src/game/MovementHandler.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Object.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/Player.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Player.h	diff1 \|	diff2 \|	blob \| history
src/game/Spell.cpp	diff1 \|	diff2 \|	blob \| history
src/game/SpellAuras.cpp	diff1 \|	diff2 \|	blob \| history
src/game/SpellEffects.cpp	diff1 \|	diff2 \|	blob \| history
src/game/SpellMgr.h	diff1 \|	diff2 \|	blob \| history
src/game/Unit.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Unit.h	diff1 \|	diff2 \|	blob \| history
src/shared/Database/DBCStores.cpp	diff1 \|	diff2 \|	blob \| history
src/shared/Database/Database.h	diff1 \|	diff2 \|	blob \| history

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

src/game/Creature.cpp	diff1 \|	diff2 \|	blob \| history
src/game/GameObject.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Group.h	diff1 \|	diff2 \|	blob \| history
src/game/Guild.h	diff1 \|	diff2 \|	blob \| history
src/game/Level3.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Mail.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Map.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Map.h	diff1 \|	diff2 \|	blob \| history
src/game/MiscHandler.cpp	diff1 \|	diff2 \|	blob \| history
src/game/MovementHandler.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Object.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/Player.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Player.h	diff1 \|	diff2 \|	blob \| history
src/game/Spell.cpp	diff1 \|	diff2 \|	blob \| history
src/game/SpellAuras.cpp	diff1 \|	diff2 \|	blob \| history
src/game/SpellEffects.cpp	diff1 \|	diff2 \|	blob \| history
src/game/SpellMgr.h	diff1 \|	diff2 \|	blob \| history
src/game/Unit.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Unit.h	diff1 \|	diff2 \|	blob \| history
src/shared/Database/DBCStores.cpp	diff1 \|	diff2 \|	blob \| history
src/shared/Database/Database.h	diff1 \|	diff2 \|	blob \| history