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

This commit is contained in:
Sebastian Messmer 2015-04-09 22:12:55 +02:00
commit 853a364c92

View File

@ -42,5 +42,5 @@
# when loading from disk such data # when loading from disk such data
# image.cpp + image.jpg # code should write open("user/block/image.jpg") # image.cpp + image.jpg # code should write open("user/block/image.jpg")
#[tests] [tests]
# test/* test/*