projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8afc7e0
9214ecb
)
Merge branch 'master' of /var/lib/git/collectd
author
Florian Forster
<octo@huhu.verplant.org>
Thu, 12 Jun 2008 08:24:10 +0000
(10:24 +0200)
committer
Florian Forster
<octo@huhu.verplant.org>
Thu, 12 Jun 2008 08:24:10 +0000
(10:24 +0200)
1
2
src/thermal.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/thermal.c
Simple merge