]> git.gag.com Git - debian/amanda/commit - common-src/queue.h
Merge commit 'upstream/3.1.0'
authorBdale Garbee <bdale@gag.com>
Mon, 14 Jun 2010 19:44:20 +0000 (13:44 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 14 Jun 2010 19:44:20 +0000 (13:44 -0600)
commitd5853102f67d85d8e169f9dbe973ad573306c215
tree774fbb13e6bff1ba59444bd9360dfffeda346e08
parentb93e5b5a13be7e970bc333acbe885f5b518300e1
parentfd48f3e498442f0cbff5f3606c7c403d0566150e
Merge commit 'upstream/3.1.0'

Conflicts:
client-src/selfcheck.c
example/amanda.conf
example/config.site
man/amanda.conf.5
man/xml-source/amanda.conf.5.xml
changer-src/chg-mcutil.sh
client-src/selfcheck.c
example/amanda.conf.in
gnulib/regenerate/regenerate
man/amanda.conf.5
man/disklist.5
man/entities/global.entities.in
man/xml-source/amanda.conf.5.xml
man/xml-source/disklist.5.xml
server-src/diskfile.h