]> git.itanic.dy.fi Git - rrdd/commitdiff
Merge branch 'master' into itanic
authorTimo Kokkonen <timo.t.kokkonen@iki.fi>
Wed, 22 Feb 2012 20:12:07 +0000 (22:12 +0200)
committerTimo Kokkonen <timo.t.kokkonen@iki.fi>
Wed, 22 Feb 2012 20:13:25 +0000 (22:13 +0200)
Signed-off-by: Timo Kokkonen <timo.t.kokkonen@iki.fi>
1  2 
database.h

diff --cc database.h
Simple merge