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

..

authserver

Core/DBLayer: More type fixes

2012-03-31 17:47:18 +01:00

collision

Core/Players

2012-03-07 18:57:47 +01:00

game

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

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

scripts

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

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

shared

Core: Tweaked ASSERT macro a bit - removed library assert as on Windows platforms it calls abort() and does not generaty crash dump files.

2012-05-12 21:11:41 +02:00

worldserver

Cmake: Remove no longer existing */dep/mersennetwister include

2012-04-09 16:03:22 +02:00

CMakeLists.txt

…