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

Conflicts:
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h

2012-12-23 08:33:13 -05:00

..

genrev

Update headers for 2012. HAPPY NEW YEAR!!!

2012-01-01 00:32:13 +01:00

server

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

2012-12-23 08:33:13 -05:00

tools

Merge branch 'master' into 4.3.4

2012-12-17 12:13:51 +01:00

CMakeLists.txt

CMake: Updated year to 2012.

2012-01-07 23:10:50 +01:00