adrian
/
encfs-java
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
231 Commits
2 Branches
0 Tags
1.1 MiB
Commit Graph

3 Commits (master)

Author SHA1 Message Date
Mark Pariente 83cf5d0d2d Fix CRLF usage 
Unfortunate to have to do this, but with the new version of git diff
explicitly showing CRLF as ^M this was starting to get annoying. We
shall use Unix newline style in encfs-java going forward.
 2012-08-22 23:08:00 -07:00
aefo bdee7ef4fa Merge remote-tracking branch 'upstream/master'. Also extracted unit 
tests to new files

Conflicts:
	src/main/java/org/mrpdaemon/sec/encfs/EncFSCrypto.java
	src/main/java/org/mrpdaemon/sec/encfs/EncFSFile.java
	src/test/java/org/mrpdaemon/sec/encfs/EncFSComparer.java
	src/test/java/org/mrpdaemon/sec/encfs/EncFSVolumeTest.java
 2011-12-21 18:05:11 +00:00
Mark Pariente 91df44286b Initial commit of encfs-java 2011-11-11 00:09:46 -08:00