]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1a9438 963e93e)
Merge remote-tracking branch 'upstream/master' into master_PKGBUILD
authorMatthias Krüger <matthias.krueger@famsik.de>
Mon, 19 Aug 2013 22:06:01 +0000 (00:06 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Mon, 19 Aug 2013 22:06:01 +0000 (00:06 +0200)

Trivial merge