Merge branch 'develop' of github.com:cryfs/cryfs into develop

This commit is contained in:
Sebastian Messmer 2016-01-27 11:15:32 +00:00
commit 63c3fa4c19

View File

@ -4,16 +4,16 @@
cryptopp/cryptopp: 8 cryptopp/cryptopp: 8
google/gmock: 4 google/gmock: 4
google/gtest: 11 google/gtest: 11
messmer/blobstore: 5 messmer/blobstore: 6
messmer/blockstore: 6 messmer/blockstore: 7
messmer/cmake: 3 messmer/cmake: 3
messmer/cpp-utils: 8 messmer/cpp-utils: 9
messmer/fspp: 6 messmer/fspp: 7
messmer/gitversion: 6 messmer/gitversion: 6
messmer/parallelaccessstore: 5 messmer/parallelaccessstore: 6
[parent] [parent]
messmer/cryfs: 10 messmer/cryfs: 11
[paths] [paths]
# Local directories to look for headers (within block) # Local directories to look for headers (within block)
# / # /