chiark
/
gitweb
/
~ianmdlvl
/
marlin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cf7c8c4
414408b
)
Merge pull request #140 from daid/Marlin_v1
author
ErikZalm
<erik@vdzalm.eu>
Thu, 12 Apr 2012 12:29:24 +0000
(
05:29
-0700)
committer
ErikZalm
<erik@vdzalm.eu>
Thu, 12 Apr 2012 12:29:24 +0000
(
05:29
-0700)
Fix for wrong systax in #ifdef.
Trivial merge