Sebastian Stenzel 1dd8a28a9d Merge remote-tracking branch 'origin/master' into 0.5.2 ...

Conflicts:
	main/core/pom.xml
	main/crypto-aes/pom.xml
	main/crypto-api/pom.xml
	main/pom.xml
	main/ui/pom.xml

2015-03-06 14:56:22 +01:00

..

src/main/java/org/cryptomator/crypto

on-the-fly MAC calculation for better performance (addresses issue #38)

2015-03-01 22:23:42 +01:00

.gitignore

renamed to Cryptomator

2014-11-29 17:03:55 +01:00

pom.xml

Branch 0.5.2 for windows

2015-03-06 14:55:30 +01:00