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

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp

2013-01-11 19:10:10 +01:00

..

base

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

2012-12-23 08:33:13 -05: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

Merge branch 'master' into 4.3.4

2012-11-19 10:09:58 +01:00

updates

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

2013-01-11 19:10:10 +01:00