diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
| commit | e0eb815b67734abd09ff41e2271630d4b2a6d760 (patch) | |
| tree | 0df971c34f98d2a1dfd0921524a17d561a4a6536 /distribution/boxbackup/DISTRIBUTION-MANIFEST.txt | |
| parent | 676c9e1c9d4ac8eb8a440d7f11c4ac44f98f4a6a (diff) | |
| parent | e19a5db232e1ef90e9a02159d2fbd9707ffe4373 (diff) | |
merge upstream version 0.12
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 |