Philipp Crocoll
3963191930
Merge branch 'kp2aforsync'
Conflicts:
src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj
src/AndroidFileChooserBinding/Transforms/Metadata.xml
src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
src/KeePassLib2Android/KeePassLib2Android.csproj
src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
src/java/InputStickAPI/gen/com/inputstick/api/R.java
src/java/InputStickAPI/src/com/inputstick/api/BTConnectionManager.java
src/java/InputStickAPI/src/com/inputstick/api/PacketManager.java
src/java/InputStickAPI/src/com/inputstick/api/bluetooth/BTService.java
src/java/InputStickAPI/src/com/inputstick/api/layout/KeyboardLayout.java
src/java/InputStickAPI/src/com/inputstick/init/BasicInitManager.java
src/java/InputStickAPI/src/com/inputstick/init/InitManager.java
src/java/JavaFileStorage/bin/javafilestorage.jar
src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar
src/java/Keepass2AndroidPluginSDK/bin/keepass2androidpluginsdk.jar
src/java/PluginInputStick/AndroidManifest.xml
src/java/PluginInputStick/gen/com/inputstick/api/R.java
src/java/PluginInputStick/gen/keepass2android/plugin/inputstick/R.java
src/java/PluginInputStick/res/values/strings_activity_settings.xml
src/java/PluginInputStick/src/keepass2android/plugin/inputstick/ActionReceiver.java
src/keepass2android/PasswordActivity.cs
src/keepass2android/Resources/Resource.designer.cs
src/keepass2android/keepass2android.csproj
2014-12-12 06:08:11 +01:00
..
2014-12-09 06:22:27 +01:00
2014-12-09 06:22:27 +01:00
2014-12-09 06:22:27 +01:00
2013-11-27 22:21:29 +01:00
2013-10-25 04:05:37 +02:00
2013-10-07 06:28:06 +02:00
2013-11-07 21:33:35 +01:00
2013-11-06 20:11:01 +01:00
2014-12-09 06:22:27 +01:00
2013-11-17 07:17:15 +01:00
2014-12-12 06:08:11 +01:00
2013-12-31 09:46:57 +01:00
2013-11-09 04:53:38 +01:00