diff options
Diffstat (limited to 'modules.txt')
| -rw-r--r-- | modules.txt | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/modules.txt b/modules.txt index 670f4ac4..54c29b0c 100644 --- a/modules.txt +++ b/modules.txt @@ -11,7 +11,11 @@ lib/raidfile lib/crypto +<<<<<<< HEAD +lib/server +======= lib/server qdbm lib/crypto +>>>>>>> 0.12 lib/compress lib/intercept @@ -25,6 +29,15 @@ test/basicserver lib/server # Backup system +<<<<<<< HEAD +lib/backupclient lib/server lib/crypto lib/compress +lib/backupstore lib/server lib/raidfile lib/backupclient + +bin/bbackupobjdump lib/backupclient lib/backupstore +bin/bbstored lib/raidfile lib/server lib/backupstore lib/backupclient +bin/bbstoreaccounts lib/raidfile lib/backupstore +bin/bbackupd lib/server lib/backupclient +======= lib/backupstore lib/server lib/raidfile lib/crypto lib/compress lib/backupclient lib/backupstore @@ -32,12 +45,17 @@ bin/bbackupobjdump lib/backupclient lib/backupstore bin/bbstored lib/raidfile lib/server lib/backupstore bin/bbstoreaccounts lib/raidfile lib/backupstore bin/bbackupd lib/server lib/backupclient qdbm +>>>>>>> 0.12 bin/bbackupquery lib/server lib/backupclient bin/bbackupctl lib/server lib/backupclient test/backupstore bin/bbstored bin/bbstoreaccounts lib/server lib/backupstore lib/backupclient lib/raidfile test/backupstorefix bin/bbstored bin/bbstoreaccounts lib/backupstore lib/raidfile bin/bbackupquery bin/bbackupd bin/bbackupctl +<<<<<<< HEAD +test/backupstorepatch bin/bbstored bin/bbstoreaccounts lib/backupstore lib/raidfile +======= test/backupstorepatch bin/bbstored bin/bbstoreaccounts lib/backupclient +>>>>>>> 0.12 test/backupdiff lib/backupclient test/bbackupd bin/bbackupd bin/bbstored bin/bbstoreaccounts bin/bbackupquery bin/bbackupctl lib/server lib/backupstore lib/backupclient lib/intercept |