Vincent-Michael 4043680a5e Fix merge fail

2014-04-05 21:44:38 +02:00

..

genrev

Update copyright note for 2014.

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

server

Fix merge fail

2014-04-05 21:44:38 +02:00

tools

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

2014-04-05 20:43:05 +02:00

CMakeLists.txt

Update copyright note for 2014.

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