]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
projects / thirdparty / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 62b6bde 7a76219)
Merge branch 'collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 23 Jan 2014 13:19:20 +0000 (14:19 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 23 Jan 2014 13:19:20 +0000 (14:19 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/amqp.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/amqp.c
Simple merge
Mirror of https://github.com/collectd/collectd.git