Carbenium b9c871fdb7 Merge commit '6390e6a4cc2d657e7fa49e80c5be32007df56ee1' into 4.3.4 ...

Conflicts:
	sql/updates/world/2014_12_30_00_world.sql
	sql/updates/world/2014_12_30_01_world.sql
	src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp

2015-07-21 20:45:16 +02:00

..

authserver

Update (C) date

2015-07-19 13:37:44 +02:00

bnetserver

Update (C) date

2015-07-19 13:37:44 +02:00

collision

Update (C) date

2015-07-19 13:37:44 +02:00

game

Merge commit '6390e6a4cc2d657e7fa49e80c5be32007df56ee1' into 4.3.4

2015-07-21 20:45:16 +02:00

ipc

Update (C) date

2015-07-19 13:37:44 +02:00

scripts

Merge commit '6390e6a4cc2d657e7fa49e80c5be32007df56ee1' into 4.3.4

2015-07-21 20:45:16 +02:00

shared

Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4

2015-07-21 20:05:44 +02:00

worldserver

Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4

2015-07-21 20:05:44 +02:00

CMakeLists.txt

Update (C) date

2015-07-19 13:37:44 +02:00