Conflicts:
	src/java/JavaFileStorage/bin/javafilestorage.jar
This commit is contained in:
Philipp Crocoll
2014-12-09 06:22:27 +01:00
parent e77c8f9ce5
commit 82c8b124bd
92 changed files with 9186 additions and 4044 deletions

2
.gitignore vendored
View File

@@ -282,3 +282,5 @@ Thumbs.db
/src/java/MasterKee
/src/PluginSdkBinding/obj/ReleaseNoNet
/src/MasterKeeWinPlugin/bin/Release
/src/SamplePlugin