]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: ba0ac97 a371c4e)
Merge branch 'master' into cooking
authorWolfgang Bumiller <wry.git@bumiller.com>
Sat, 24 May 2014 15:13:05 +0000 (17:13 +0200)
committerWolfgang Bumiller <wry.git@bumiller.com>
Sat, 24 May 2014 15:13:05 +0000 (17:13 +0200)

Trivial merge