![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sun, 11 Feb 2007 14:39:58 +0000 (15:39 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sun, 11 Feb 2007 14:39:58 +0000 (15:39 +0100) |
Conflicts:
src/multimeter.c
src/plugin.c
src/multimeter.c
src/plugin.c
| 1 | 2 | |||
|---|---|---|---|---|
| configure.in | patch | | diff1 | | diff2 | | blob | history |
diff --cc configure.in
Simple merge