]> git.ipfire.org Git - thirdparty/rrdtool-1.x.git/commitdiff
projects / thirdparty / rrdtool-1.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3a6f7f f16e39e)
Merge remote-tracking branch 'upstream/master'
authorMaksym Sobolyev <sobomax@sippysoft.com>
Mon, 22 Dec 2014 20:26:48 +0000 (12:26 -0800)
committerMaksym Sobolyev <sobomax@sippysoft.com>
Mon, 22 Dec 2014 20:26:48 +0000 (12:26 -0800)
Conflicts:
src/rrd_graph_helper.c

1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/rrd_update.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/rrd_update.c
Simple merge
Mirror of https://github.com/oetiker/rrdtool-1.x.git