]> 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: c587734 76bb77f)
Merge branch 'master' into matthiaskrgr/gitignore
authorMatthias Krüger <matthias.krueger@famsik.de>
Sun, 16 Jun 2013 16:27:22 +0000 (18:27 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sun, 16 Jun 2013 16:27:22 +0000 (18:27 +0200)

Trivial merge