joschiwald cd7ab6f3a5 Merge branch 'master' of github.com:joschiwald/TrinityCore into spellscripts ...

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Spells/spell_paladin.cpp

2012-05-28 04:27:51 +02:00

..

base

Core/Conditions: Add missing code for CONDITION_TITLE

2012-04-08 12:56:18 +01:00

create

Buildsystem: Stop the retarded recursive hunting for CMakeLists.txt when copying SQL-files nad use the proper method for direct copying.

2010-12-24 18:33:11 +01:00

old

TDB 335.11.47 - 2012/05/19

2012-05-19 14:27:24 +01:00

updates/world

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

2012-05-28 04:27:51 +02:00