![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Fri, 22 Aug 2014 21:22:34 +0000 (23:22 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Fri, 22 Aug 2014 21:22:34 +0000 (23:22 +0200) |
Conflicts:
configure.ac
configure.ac
| 1 | 2 | |||
|---|---|---|---|---|
| AUTHORS | patch | | diff1 | | diff2 | | blob | history |
| configure.ac | patch | | diff1 | | diff2 | | blob | history |
| contrib/redhat/collectd.spec | patch | | diff1 | | diff2 | | blob | history |
| src/Makefile.am | patch | | diff1 | | diff2 | | blob | history |
diff --cc AUTHORS
Simple merge
diff --cc configure.ac
Simple merge
diff --cc contrib/redhat/collectd.spec
Simple merge
diff --cc src/Makefile.am
Simple merge