]> 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: 4ec5ed8 f81e89c)
Merge branch 'master' into matthiaskrgr/domicons
authorMatthias Krüger <matthias.krueger@famsik.de>
Sun, 8 Feb 2015 11:35:50 +0000 (12:35 +0100)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sun, 8 Feb 2015 11:35:50 +0000 (12:35 +0100)

Trivial merge