![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@noris.net> | |
| Tue, 29 Apr 2008 15:45:16 +0000 (17:45 +0200) | ||
| committer | Florian Forster <octo@noris.net> | |
| Tue, 29 Apr 2008 15:45:16 +0000 (17:45 +0200) |
Conflicts:
src/sensors.c
src/sensors.c
| 1 | 2 | |||
|---|---|---|---|---|
| src/sensors.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/sensors.c
Simple merge