projects
/
xonotic
/
gmqcc.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ba0ac97
a371c4e
)
Merge branch 'master' into cooking
author
Wolfgang Bumiller <wry.git@bumiller.com>
Sat, 24 May 2014 15:13:05 +0000
(17:13 +0200)
committer
Wolfgang Bumiller <wry.git@bumiller.com>
Sat, 24 May 2014 15:13:05 +0000
(17:13 +0200)
Trivial merge
projects / xonotic / gmqcc.git / commitdiff