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

Conflicts:
	src/server/scripts/Commands/cs_reload.cpp

2013-01-03 23:41:36 +01:00

..

authserver

Update copyright note for 2013.

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

collision

Update copyright note for 2013.

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

game

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

2013-01-03 23:41:36 +01:00

scripts

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

2013-01-03 23:41:36 +01:00

shared

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

worldserver

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

CMakeLists.txt

Update copyright note for 2013.

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