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

Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Server/WorldSession.cpp

2013-09-01 23:48:40 +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-09-01 23:48:40 +02:00

tools

Merge remote-tracking branch 'origin/master' into 4.3.4

2013-08-26 12:40:41 +01:00

CMakeLists.txt

Update copyright note for 2013.

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