keepass2android/src/java/KP2ASoftkeyboard_AS
Philipp Crocoll 0e40033d85 Merge branch 'Branch_1.0.0-pre7c'
Conflicts:
	src/java/JavaFileStorage/app/build/outputs/aar/app-debug.aar
	src/java/KP2ASoftkeyboard_AS/.idea/workspace.xml
	src/java/KP2ASoftkeyboard_AS/app/build/outputs/aar/app-debug.aar
2016-02-16 11:59:39 +01:00
..
.idea Merge branch 'Branch_1.0.0-pre7c' 2016-02-16 11:59:39 +01:00
app Merge branch 'Branch_1.0.0-pre7c' 2016-02-16 11:59:39 +01:00
gradle/wrapper convert keyboard project to Android Studio / Gradle project 2016-01-13 21:37:41 +01:00
build.gradle convert keyboard project to Android Studio / Gradle project 2016-01-13 21:37:41 +01:00
gradlew convert keyboard project to Android Studio / Gradle project 2016-01-13 21:37:41 +01:00
gradlew.bat convert keyboard project to Android Studio / Gradle project 2016-01-13 21:37:41 +01:00
KP2ASoftkeyboard_AS.iml convert keyboard project to Android Studio / Gradle project 2016-01-13 21:37:41 +01:00
settings.gradle convert keyboard project to Android Studio / Gradle project 2016-01-13 21:37:41 +01:00