]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69e29c3 3c8ce7c)
Merge branch 'master' into cooking
authorWolfgang Bumiller <blub@speed.at>
Fri, 25 Jan 2013 15:03:38 +0000 (16:03 +0100)
committerWolfgang Bumiller <blub@speed.at>
Fri, 25 Jan 2013 15:03:38 +0000 (16:03 +0100)

Trivial merge