chiark
/
gitweb
/
~ianmdlvl
/
marlin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8446c9d
c27081a
)
Merge pull request #156 from Atntias/patch-2
author
ErikZalm
<erik@vdzalm.eu>
Sat, 28 Apr 2012 20:19:00 +0000
(13:19 -0700)
committer
ErikZalm
<erik@vdzalm.eu>
Sat, 28 Apr 2012 20:19:00 +0000
(13:19 -0700)
Fix to allow M120/M121
Trivial merge