Commit Graph

6 Commits (master)

Author SHA1 Message Date
Mark Pariente be943ceaca Remove .vimrc and add it + cscope stuff to .gitignore 2013-04-21 13:35:05 -07:00
Zdenek Farana ce6b9c4417 Simple method for checking if the provided path contains EncFS volume by detecting EncFS config file 2012-06-25 23:34:06 +02:00
Mark Pariente aaa137d3fc Add .settings to .gitignore 2012-02-26 19:26:07 -08: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
aefo b22fa41b97 ignore eclipse bin dir 2011-12-17 17:07:48 +00:00
Mark Pariente 91df44286b Initial commit of encfs-java 2011-11-11 00:09:46 -08:00