qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pluginhosttest'

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Philipp Crocoll
2014-05-16 17:17:43 +02:00
parent 34d591b251 bcbc225652
commit 7a40368ed3
483 changed files with 27953 additions and 7162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -238,3 +238,7 @@ Thumbs.db
/src/java/JavaFileStorageTest/gen/com/google/android/gms/R.java
/src/java/JavaFileStorageTest/gen/group/pals/android/lib/ui/filechooser/R.java
/src/java/JavaFileStorageTest/gen/keepass2android/javafilestorage/R.java
/src/java/PluginQR/bin
/src/PluginHostTest/bin/Debug
/src/java/Keepass2AndroidPluginSDK/bin