Carbenium 230db1a5f5 Fix merge

2015-07-21 21:28:39 +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 'ccdc100d10143285bc058d968f0472ea4d073120' into 4.3.4

2015-07-21 21:21:09 +02:00

ipc

Update (C) date

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

scripts

Fix merge

2015-07-21 21:28:39 +02:00

shared

Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4

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

worldserver

Merge commit 'ccdc100d10143285bc058d968f0472ea4d073120' into 4.3.4

2015-07-21 21:21:09 +02:00

CMakeLists.txt

Update (C) date

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