projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7b0cde 8d0b725)
Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 11 Aug 2016 15:45:48 +0000 (17:45 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 11 Aug 2016 15:45:48 +0000 (17:45 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/utils_db_query.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/utils_db_query.c
Simple merge
collectd, the system statistics collection daemon