]> 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: afe1545 d5701c7)
Merge branch 'master' into divVerent/augenkrebs divVerent/augenkrebs
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 5 Apr 2018 20:18:14 +0000 (13:18 -0700)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 5 Apr 2018 20:18:14 +0000 (13:18 -0700)

Trivial merge