Vincent_Michael b2d05c9cdd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Spells/SpellMgr.cpp

2013-02-28 22:14:48 +01:00

..

base

Merge branch 'master' into 4.3.4

2013-02-27 04:08:19 +01:00

create

…

old

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2013-02-18 18:51:52 +01:00

updates

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2013-02-28 22:14:48 +01:00