]> git.sur5r.net Git - bacula/bacula/commitdiff
Merge branch 'master' into basejobv3
authorEric Bollengier <eric@eb.homelinux.org>
Fri, 23 Oct 2009 12:26:02 +0000 (14:26 +0200)
committerEric Bollengier <eric@eb.homelinux.org>
Fri, 23 Oct 2009 12:26:02 +0000 (14:26 +0200)
1  2 
bacula/src/baconfig.h
bacula/src/cats/cats.h
bacula/src/cats/sql_create.c
bacula/src/cats/sql_get.c
bacula/src/cats/sql_update.c
bacula/src/dird/dird_conf.c
bacula/src/dird/dird_conf.h
bacula/src/dird/ua_purge.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge