projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06efe4f 0fdd511)
Merge remote-tracking branch 'origin/pr/1188'
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 13 Aug 2015 21:35:57 +0000 (23:35 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 13 Aug 2015 21:35:57 +0000 (23:35 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
collectd, the system statistics collection daemon