chiark
/
gitweb
/
~ianmdlvl
/
marlin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0183e63
520f1a5
)
Merge pull request #126 from tommycheng/patch-1
author
ErikZalm
<erik@vdzalm.eu>
Fri, 23 Mar 2012 18:54:37 +0000
(11:54 -0700)
committer
ErikZalm
<erik@vdzalm.eu>
Fri, 23 Mar 2012 18:54:37 +0000
(11:54 -0700)
Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined...
Trivial merge