]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8caa9ad eae3784)
Merge branch 'master' into matthiaskrgr/gitignore
authorMatthias Krüger <matthias.krueger@famsik.de>
Thu, 13 Jun 2013 20:45:40 +0000 (22:45 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Thu, 13 Jun 2013 20:45:40 +0000 (22:45 +0200)

Trivial merge