Vincent-Michael 89fae5d172 Core: Fix merge fail

2014-10-18 00:37:24 +02:00

..

genrev

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

server

Core: Fix merge fail

2014-10-18 00:37:24 +02:00

tools

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

2014-10-10 05:29:06 +02:00

CMakeLists.txt

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00