]> 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: 50dc589 4122acc)
Merge branch 'master' into matthiaskrgr/screenshotcmd
authorMatthias Krüger <matthias.krueger@famsik.de>
Sun, 23 Jun 2013 20:47:53 +0000 (22:47 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sun, 23 Jun 2013 20:47:53 +0000 (22:47 +0200)

Trivial merge