]> git.ipfire.org Git - thirdparty/fcron.git/commitdiff
Merge branch 'master' of ssh://yo4096@git.tuxfamily.org/gitroot/fcron/fcron
authorThibault Godouet <yo8192@users.noreply.github.com>
Tue, 8 Dec 2009 22:38:07 +0000 (22:38 +0000)
committerThibault Godouet <yo8192@users.noreply.github.com>
Tue, 8 Dec 2009 22:38:07 +0000 (22:38 +0000)
1  2 
fileconf.c

diff --cc fileconf.c
Simple merge