projects
/
xonotic
/
gmqcc.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6800d15
9908209
)
Merge branch 'master' into cooking
author
Dale Weiler <killfieldengine@gmail.com>
Sun, 8 Sep 2013 17:05:20 +0000
(13:05 -0400)
committer
Dale Weiler <killfieldengine@gmail.com>
Sun, 8 Sep 2013 17:05:20 +0000
(13:05 -0400)
Trivial merge