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
..
android-filechooser	update translations from crowdin	2015-10-29 22:00:28 +01:00
InputStickAPI	updated InputStick plugin (and migrated to Android Studio)	2016-01-28 06:55:17 +01:00
JavaFileStorage	Merge branch 'Branch_1.0.0-pre7c'	2016-02-16 11:59:39 +01:00
JavaFileStorageTest	update dropbox SDK to 1.6.2	2014-12-10 22:22:27 +01:00
Keepass2AndroidPluginSDK	0.9.8-pre2	2015-08-12 06:40:14 +02:00
kp2akeytransform	Fix for Theme: ActionBarStyle Buttons too small	2014-02-07 20:35:51 +01:00
KP2AKdbLibrary	0.9.8-pre2	2015-08-12 06:40:14 +02:00
KP2ASoftkeyboard_AS	Merge branch 'Branch_1.0.0-pre7c'	2016-02-16 11:59:39 +01:00
PluginA	.gitignore: Do not track R.java files	2014-09-13 16:12:12 +02:00
PluginInputStick3	removed file from index	2016-01-31 16:45:22 +01:00
PluginQR	.gitignore: Do not track R.java files	2014-09-13 16:12:12 +02:00
.gitignore	* directly integrated LiveSDK files to allow modification and simplify build	2014-07-30 06:02:35 +02:00