Philipp Crocoll c7cf120c1d Merge branch 'master' into MaterialDesign ... Conflicts: src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj src/JavaFileStorageBindings/JavaFileStorageBindings.csproj src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj src/KeePass.sln src/KeePassLib2Android/KeePassLib2Android.csproj src/PluginSdkBinding/PluginSdkBinding.csproj src/keepass2android/AboutActivity.cs src/keepass2android/ExportDatabaseActivity.cs src/keepass2android/GroupActivity.cs src/keepass2android/GroupBaseActivity.cs src/keepass2android/Properties/AndroidManifest_net.xml src/keepass2android/keepass2android.csproj src/keepass2android/search/SearchProvider.cs		2015-09-04 05:34:27 +02:00
..
android-filechooser	added files to simplify build	2015-09-02 22:32:28 +02:00
InputStickAPI	update InputStick Plugin to 1.31	2015-06-23 17:25:27 +02:00
JavaFileStorage	0.9.8-pre2	2015-08-12 06:40:14 +02: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	modified dimens.xml to hopefully fix a problem with incorrect keyboard size	2014-03-31 07:22:21 +02:00
KP2ASoftKeyboard2	added files to simplify build	2015-09-02 22:32:28 +02:00
PluginA	.gitignore: Do not track R.java files	2014-09-13 16:12:12 +02:00
PluginInputStick	update InputStick Plugin to 1.31	2015-06-23 17:25:27 +02: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