Merge branch 'master' into ff/rrdd
authorFlorian Forster <octo@verplant.org>
Mon, 8 Sep 2008 07:52:30 +0000 (09:52 +0200)
committerFlorian Forster <octo@verplant.org>
Mon, 8 Sep 2008 07:52:30 +0000 (09:52 +0200)
commit8fdbf4660969f9bde7f0f434f2d1002028d36814
tree938fbd6b8037bd6ddccbf9b0cbbf510f1f69ed61
parent210e991460e82d01d086f853e65485040eb2fffb
parent3751e39b17ac8807d0fb68e0096228ad8da54e43
Merge branch 'master' into ff/rrdd

Conflicts:

doc/rrdgraph.pod
src/librrd.sym.in
src/rrd_lastupdate.c
src/rrd_update.c
16 files changed:
configure.ac
doc/rrdgraph.pod
doc/rrdtool.pod
src/Makefile.am
src/librrd.sym.in
src/rrd.h
src/rrd_dump.c
src/rrd_fetch.c
src/rrd_graph.c
src/rrd_info.c
src/rrd_last.c
src/rrd_lastupdate.c
src/rrd_tool.c
src/rrd_tool.h
src/rrd_update.c
src/rrd_xport.c