]> 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)
commit51f54360499bd4bcb9ac9fb63adda2f4fd02d40d
treea62400ec18e8f326ac76712f5ff32d26b18b524a
parenta2229d16fceae509bf5eadc6bf662e17528a341b
parent3e192a5112c15535ab7aa1c81a8e9ad1d0318de5
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