]> git.sur5r.net Git - bacula/bacula/commit
Merge branch 'master' into basejobv3
authorEric Bollengier <eric@eb.homelinux.org>
Mon, 31 Aug 2009 12:33:51 +0000 (14:33 +0200)
committerEric Bollengier <eric@eb.homelinux.org>
Mon, 31 Aug 2009 12:33:51 +0000 (14:33 +0200)
commit94ed37ea6172925acc34a97105065bb34bfc614d
treefd672b3f83ae36a3b3e9b0776e6b9b92a180c0f2
parentdb012fac32af3c79c4843a35709ff0efa88f8730
parent06221438d6f25eafc3e50ca50ae6d59bab2d6fc2
Merge branch 'master' into basejobv3

Conflicts:
bacula/src/cats/protos.h
bacula/src/cats/sql_get.c
bacula/src/dird/backup.c
bacula/src/baconfig.h
bacula/src/cats/cats.h
bacula/src/cats/protos.h
bacula/src/cats/sql.c
bacula/src/cats/sql_get.c
bacula/src/dird/backup.c
bacula/src/dird/job.c
bacula/src/dird/ua_output.c
bacula/src/dird/ua_restore.c