]> 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: b9a9e23 e64eb04)
Merge remote-tracking branch 'origin/matthiaskrgr/screenshotcmd' into matthiaskrgr... matthiaskrgr/screenshotcmd
authorMatthias Krüger <matthias.krueger@famsik.de>
Mon, 27 Jun 2016 01:32:35 +0000 (03:32 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Mon, 27 Jun 2016 01:32:35 +0000 (03:32 +0200)

Trivial merge