Merge branch 'master' into maddin/map-warfare-updates
authorMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:29:23 +0000 (00:29 +0200)
committerMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:29:23 +0000 (00:29 +0200)
commit60078c4e316512929f4f7d04d59a4ba10725415a
tree51304c8e9513817c7ae8531c5848a4f375338ca6
parent2d8cd99ae1e58d8ebf7dfcb68e23a99373658307
parent14d35acc1b569b6330de5ae293f11dae8e5e4f8c
Merge branch 'master' into maddin/map-warfare-updates
maps/warfare.map