]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a6d4cd f0d7836)
Merge branch 'maint'
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 20 Aug 2015 17:19:07 +0000 (19:19 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 20 Aug 2015 17:19:07 +0000 (19:19 +0200)

Trivial merge