]> git.ipfire.org Git - thirdparty/rrdtool-1.x.git/commit
Merge remote-tracking branch 'upstream/master'
authorMaksym Sobolyev <sobomax@sippysoft.com>
Wed, 28 Jan 2015 18:38:54 +0000 (10:38 -0800)
committerMaksym Sobolyev <sobomax@sippysoft.com>
Wed, 28 Jan 2015 18:38:54 +0000 (10:38 -0800)
commit6b3face4f252cfb91f9e2fba1038ac880ee07e32
tree214210cd7f485f5ba2a60f19f4b34c4e8ff388eb
parentf34ae3f41025e96b89d20da15de2ee578f33826b
parent683c8db7658250d1fef2ed57dd59ab4ad43478fa
Merge remote-tracking branch 'upstream/master'

Conflicts:
configure.ac
configure.ac