]> 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: 7227743 6f9619e)
Merge branch '1.5' of github.com:oetiker/rrdtool-1.x
authorTobias Oetiker <tobi@oetiker.ch>
Tue, 10 Nov 2015 15:08:24 +0000 (16:08 +0100)
committerTobias Oetiker <tobi@oetiker.ch>
Tue, 10 Nov 2015 15:08:24 +0000 (16:08 +0100)
Conflicts:
README.md


Trivial merge
Mirror of https://github.com/oetiker/rrdtool-1.x.git