]> git.ipfire.org Git - thirdparty/fcron.git/commitdiff
Merge branch 'suspend'
authorThibault Godouet <yo8192@users.noreply.github.com>
Sun, 26 Jun 2016 17:39:33 +0000 (18:39 +0100)
committerThibault Godouet <yo8192@users.noreply.github.com>
Sun, 26 Jun 2016 17:39:33 +0000 (18:39 +0100)
21 files changed:
1  2 
conf.c
config.h.in
configure.in
database.c
database.h
doc/en/changes.sgml
doc/en/faq.sgml
doc/en/fcron.8.sgml
doc/en/fcron.conf.5.sgml
doc/en/fcrontab.5.sgml
doc/en/todo.sgml
doc/fcron-doc.mod.in
fcron.c
fcronconf.c
fcronconf.h
fcrondyn_svr.c
fcrondyn_svr.h
fileconf.c
global.h
log.h
option.h

diff --cc conf.c
Simple merge
diff --cc config.h.in
Simple merge
diff --cc configure.in
Simple merge
diff --cc database.c
Simple merge
diff --cc database.h
Simple merge
Simple merge
diff --cc doc/en/faq.sgml
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fcron.c
Simple merge
diff --cc fcronconf.c
Simple merge
diff --cc fcronconf.h
Simple merge
diff --cc fcrondyn_svr.c
Simple merge
diff --cc fcrondyn_svr.h
Simple merge
diff --cc fileconf.c
Simple merge
diff --cc global.h
Simple merge
diff --cc log.h
Simple merge
diff --cc option.h
Simple merge