Sebastian Meßmer d3ba6d1c39 Fix merge conflict		2019-01-30 15:57:13 -08:00
..
blobstore	Add Blob::numNodes()	2019-01-26 11:19:25 -08:00
blockstore	Merge from release/0.10	2019-01-27 05:38:17 -08:00
cpp-utils	Merge from release/0.10	2019-01-27 05:38:17 -08:00
cryfs	Fix include path	2019-01-27 09:18:34 -08:00
cryfs-cli	Move cryfs code into impl/ subfolder	2019-01-25 23:47:17 -08:00
cryfs-unmount	Move cryfs code into impl/ subfolder	2019-01-25 23:47:17 -08:00
fspp	Merge from release/0.10	2019-01-27 05:38:17 -08:00
gitversion	Fixes for MSVC	2018-07-17 21:08:17 -07:00
parallelaccessstore	Use boost::promise because std::promise doesn't compile on windows with non-default-constructible types	2018-05-20 19:22:46 -07:00
stats	Fix merge conflict	2019-01-30 15:57:13 -08:00
CMakeLists.txt	Implement cryfs-unmount for unmounting filesystems	2019-01-19 13:02:41 -08:00