Carbenium 63df41b6b2 Merge commit '805be8ebba07c3280089a128f1764d49f6f84ab6' into 4.3.4 ...

Conflicts:
	sql/updates/world/2014_10_21_00_world.sql

2015-07-21 18:17:08 +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 '805be8ebba07c3280089a128f1764d49f6f84ab6' into 4.3.4

2015-07-21 18:17:08 +02:00

ipc

Update (C) date

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

scripts

Merge commit '805be8ebba07c3280089a128f1764d49f6f84ab6' into 4.3.4

2015-07-21 18:17:08 +02:00

shared

Update (C) date

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

worldserver

Update (C) date

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

CMakeLists.txt

Update (C) date

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