encfs-java/.gitignore

.classpath
.project
.settings
eclipse_bin
target
.idea
*.iml
.vimrc
cscope*
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 19:05:11 +01:00			`.classpath`
			`.project`
Add .settings to .gitignore 2012-02-27 04:26:07 +01:00			`.settings`
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 19:05:11 +01:00			`eclipse_bin`
			`target`
Simple method for checking if the provided path contains EncFS volume by detecting EncFS config file 2012-06-25 23:34:06 +02:00			`.idea`
			`*.iml`
Remove .vimrc and add it + cscope stuff to .gitignore 2013-04-21 22:34:00 +02:00			`.vimrc`
			`cscope*`