]> 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: 33f268f 3034dc9)
Merge branch 'master' into matthiaskrgr/domicons matthiaskrgr/domicons
authorMatthias Krüger <matthias.krueger@famsik.de>
Mon, 27 Jun 2016 01:26:31 +0000 (03:26 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Mon, 27 Jun 2016 01:26:31 +0000 (03:26 +0200)

Trivial merge