Go to file
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
src Merge branch 'kp2aforsync' 2014-12-12 06:08:11 +01:00
.gitignore Key files can be opened from deliberate locations 2014-11-08 21:29:36 +01:00
CONTRIBUTORS initial release 0.5.0 BETA 2013-02-23 17:45:00 +01:00
COPYING Fixed bug with loading attachments from kdb 2014-01-26 05:27:27 -08:00
LICENSE Fixed bug with loading attachments from kdb 2014-01-26 05:27:27 -08:00