]> git.sur5r.net Git - bacula/bacula/commit - bacula/src/lib/bnet.c
Merge branch 'master' into basejobv3
authorEric Bollengier <eric@eb.homelinux.org>
Thu, 5 Nov 2009 14:33:16 +0000 (15:33 +0100)
committerEric Bollengier <eric@eb.homelinux.org>
Thu, 5 Nov 2009 14:33:16 +0000 (15:33 +0100)
commit53f3f6e4ca4b44166668ca9a7647f67fd934162f
tree006d871e6f9637d98d2ce0b65d686d58abc90c98
parent120259de1146b2005e15af6b8be94e3bc59c88a4
parenta621f7f3c69c426b0a676c51e02723f686ebec4a
Merge branch 'master' into basejobv3
bacula/src/cats/cats.h
bacula/src/cats/sql.c
bacula/src/cats/sql_cmds.c
bacula/src/cats/sql_cmds.h
bacula/src/cats/sql_create.c
bacula/src/dird/catreq.c
bacula/src/dird/dird.c
bacula/src/dird/job.c
bacula/src/dird/ua_tree.c
bacula/src/jcr.h