]> 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: 2092d81 cfaacd5)
Merge branch 'master' into matthiaskrgr/gitignore
authorMatthias Krüger <matthias.krueger@famsik.de>
Sun, 9 Jun 2013 07:22:21 +0000 (09:22 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sun, 9 Jun 2013 07:22:21 +0000 (09:22 +0200)

Trivial merge