projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c0c3ee0
4898211
)
Merge branch 'martin-t/campaign' into 'master'
author
Mirio <opivy@hotmail.de>
Wed, 1 Feb 2017 18:23:53 +0000
(18:23 +0000)
committer
Mirio <opivy@hotmail.de>
Wed, 1 Feb 2017 18:23:53 +0000
(18:23 +0000)
Campaign description tweaks
See merge request !60
Trivial merge