projects
/
xonotic
/
gmqcc.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9e5d02d
f1650c4
)
Merge remote-tracking branch 'origin/master' into cooking
author
Wolfgang Bumiller <wry.git@bumiller.com>
Mon, 7 Apr 2014 12:23:35 +0000
(14:23 +0200)
committer
Wolfgang Bumiller <wry.git@bumiller.com>
Mon, 7 Apr 2014 12:23:35 +0000
(14:23 +0200)
Trivial merge