]> git.sur5r.net Git - bacula/bacula/commit
Fix merge collision
authorKern Sibbald <kern@sibbald.com>
Wed, 11 Jan 2006 09:21:55 +0000 (09:21 +0000)
committerKern Sibbald <kern@sibbald.com>
Wed, 11 Jan 2006 09:21:55 +0000 (09:21 +0000)
commitcded12aa4bebff6b183645c1a606808b7b188e0d
treedaa0f4df13953934d6b64eaf88c7d16e738c430c
parentecedf2376488a1afb2551355f1e3c545d66cedb7
Fix merge collision

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2735 91ce42f0-d328-0410-95d8-f526ca767f89
bacula/src/dird/dird_conf.c
bacula/src/dird/dird_conf.h
bacula/src/dird/scheduler.c
bacula/src/dird/ua_cmds.c
bacula/src/dird/ua_dotcmds.c
bacula/src/dird/ua_label.c
bacula/src/dird/ua_status.c
bacula/src/dird/ua_update.c