]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'martin-t/campaign2' into 'master'
authorMirio <opivy@hotmail.de>
Tue, 7 Feb 2017 15:56:04 +0000 (15:56 +0000)
committerMirio <opivy@hotmail.de>
Tue, 7 Feb 2017 15:56:04 +0000 (15:56 +0000)
commitd912afa0b61ecfed876371420f16f5f810a73f37
treeff41a1d3d5562ffe12ab7b8d2d544fa01ca6c97a
parent5298ef278c5bd959c65ae2792f76b1d11072b6c5
parent99bd64091880bf8f596aea8770d9c80f9a6a55f2
Merge branch 'martin-t/campaign2' into 'master'

More campaign description fixes

See merge request !61