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

Conflicts:
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp

2013-01-03 18:07:53 +01:00

..

characters

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

2012-12-23 08:34:10 -05:00

world

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

2013-01-03 18:07:53 +01:00