]> 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: cae073f 1b5a2ad)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into...
authorMaddin <mjschwan@gmx.de>
Thu, 28 Jul 2016 18:31:14 +0000 (20:31 +0200)
committerMaddin <mjschwan@gmx.de>
Thu, 28 Jul 2016 18:31:14 +0000 (20:31 +0200)
... is it correct to merge upstream? :/ Let's try it!


Trivial merge