projects
/
xonotic
/
gmqcc.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0d1a740
a371c4e
)
Merge branch 'master' into cooking
author
Dale Weiler <weilercdale@gmail.com>
Wed, 14 May 2014 03:22:25 +0000
(23:22 -0400)
committer
Dale Weiler <weilercdale@gmail.com>
Wed, 14 May 2014 03:22:25 +0000
(23:22 -0400)
Trivial merge
projects / xonotic / gmqcc.git / commitdiff