]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5298ef2 99bd640)
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)
More campaign description fixes

See merge request !61


Trivial merge