]> de.git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3cb85d5 deb8e46)
Merge branch 'master' into matthiaskrgr/gitignore
authorMatthias Krüger <matthias.krueger@famsik.de>
Sun, 9 Jun 2013 07:23:18 +0000 (09:23 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sun, 9 Jun 2013 07:23:18 +0000 (09:23 +0200)

Trivial merge