Carbenium ee53cf1a88 Fix merge

2015-07-22 00:06:43 +02:00

..

authserver

Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4

2015-07-21 23:46:56 +02:00

bnetserver

Update (C) date

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

collision

Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4

2015-07-21 23:46:56 +02:00

game

Fix merge

2015-07-22 00:06:43 +02:00

ipc

Update (C) date

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

scripts

Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4

2015-07-21 23:46:56 +02:00

shared

Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4

2015-07-21 23:46:56 +02:00

worldserver

Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4

2015-07-21 23:46:56 +02:00

CMakeLists.txt

Update (C) date

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