Merge branch 'master' of C:\ph\keepass2android

Conflicts:
	src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/fileHashes.bin
	src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
	src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
This commit is contained in:
Philipp Crocoll
2017-04-11 02:22:54 +02:00
44 changed files with 2360 additions and 102 deletions

View File

@@ -7,5 +7,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Tue Sep 20 20:29:56 CEST 2016
#Mon Sep 05 10:28:53 CEST 2016
sdk.dir=C\:\\Users\\Philipp\\AppData\\Local\\Xamarin\\Universal\\AndroidSDK