keepass2android/src/java/KP2ASoftkeyboard_AS/.idea
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
..
copyright convert keyboard project to Android Studio / Gradle project 2016-01-13 21:37:41 +01:00
.name convert keyboard project to Android Studio / Gradle project 2016-01-13 21:37:41 +01:00
compiler.xml convert keyboard project to Android Studio / Gradle project 2016-01-13 21:37:41 +01:00
gradle.xml convert keyboard project to Android Studio / Gradle project 2016-01-13 21:37:41 +01:00
misc.xml convert keyboard project to Android Studio / Gradle project 2016-01-13 21:37:41 +01:00
modules.xml convert keyboard project to Android Studio / Gradle project 2016-01-13 21:37:41 +01:00
vcs.xml 7c release 2016-02-07 20:55:29 +01:00