projects
/
xonotic
/
gmqcc.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
24763aa
7ffda37
)
Merge branch 'master' into cooking
author
Wolfgang Bumiller <wry.git@bumiller.com>
Sat, 8 Feb 2014 09:33:50 +0000
(10:33 +0100)
committer
Wolfgang Bumiller <wry.git@bumiller.com>
Sat, 8 Feb 2014 09:33:50 +0000
(10:33 +0100)
Trivial merge