]> de.git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2f13eb fc7d32a)
Merge branch 'master' into blub/parser
authorWolfgang (Blub) Bumiller <blub@speed.at>
Sun, 12 Aug 2012 09:39:52 +0000 (11:39 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Sun, 12 Aug 2012 09:39:52 +0000 (11:39 +0200)

Trivial merge