diff options
Diffstat (limited to 'distribution/boxbackup/DISTRIBUTION-MANIFEST.txt')
| -rw-r--r-- | distribution/boxbackup/DISTRIBUTION-MANIFEST.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt b/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt index 3677d376..2fca9572 100644 --- a/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt +++ b/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt @@ -1,4 +1,8 @@ LICENSE-GPL.txt +<<<<<<< HEAD +======= +qdbm +>>>>>>> 0.12 LICENSE DUAL lib/intercept @@ -27,8 +31,11 @@ test/backupstorepatch test/bbackupd test/bbackupd/testfiles test/backupdiff +<<<<<<< HEAD test/httpserver/testfiles test/httpserver/testfiles/photos +======= +>>>>>>> 0.12 docs/Makefile docs/tools |