]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c14f2b0 6662b15)
Merge branch 'maint'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 19 Aug 2015 23:31:23 +0000 (01:31 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 19 Aug 2015 23:31:23 +0000 (01:31 +0200)

Trivial merge