]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69d9afb cfdf915)
Merge branch 'master' into blub/parser
authorWolfgang (Blub) Bumiller <blub@speed.at>
Tue, 14 Aug 2012 08:42:34 +0000 (10:42 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Tue, 14 Aug 2012 08:42:34 +0000 (10:42 +0200)

Trivial merge