Vincent-Michael f506ee3077 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

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

2013-08-11 18:37:31 +02:00

..

genrev

Buildsystem: Do not print warning that user needs to do a git pull with tags if configured to not use git at all

2013-02-12 12:21:24 +01:00

server

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

2013-08-11 18:37:31 +02:00

tools

Tools/MapExtractor: Add some missing includes, needed for OSX

2013-08-06 12:49:37 +01:00

CMakeLists.txt

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00