Carbenium f7f6eae247 Merge commit 'd3ad87b1cf48222aef5cbbc1f00cf2babadce111' into 4.3.4 ...

Conflicts:
	sql/updates/world/2015_03_16_00_world.sql
	sql/updates/world/2015_03_16_01_world_335.sql

2015-07-21 23:35:43 +02:00

..

authserver

Merge commit '7833d3414667af5e2c55280a060fa54f43d1e25f' into 4.3.4

2015-07-21 23:27:27 +02:00

bnetserver

Update (C) date

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

collision

Merge commit '7833d3414667af5e2c55280a060fa54f43d1e25f' into 4.3.4

2015-07-21 23:27:27 +02:00

game

Merge commit 'd3ad87b1cf48222aef5cbbc1f00cf2babadce111' into 4.3.4

2015-07-21 23:35:43 +02:00

ipc

Update (C) date

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

scripts

Merge commit 'd3ad87b1cf48222aef5cbbc1f00cf2babadce111' into 4.3.4

2015-07-21 23:35:43 +02:00

shared

Merge commit 'd3ad87b1cf48222aef5cbbc1f00cf2babadce111' into 4.3.4

2015-07-21 23:35:43 +02:00

worldserver

Merge commit '7833d3414667af5e2c55280a060fa54f43d1e25f' into 4.3.4

2015-07-21 23:27:27 +02:00

CMakeLists.txt

Update (C) date

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