Go to file
Philipp Crocoll 26686ed8a7 Merge branch 'master' of https://git01.codeplex.com/forks/wlawski/keepass2android into wlawski
Conflicts:
	.gitignore
	src/java/InputStickAPI/gen/com/inputstick/api/R.java
	src/java/PluginInputStick/gen/com/inputstick/api/R.java
	src/java/PluginInputStick/gen/keepass2android/plugin/inputstick/R.java
	src/java/PluginInputStick/gen/keepass2android/pluginsdk/R.java
	src/keepass2android/Resources/Resource.designer.cs
2014-12-14 07:29:29 +01:00
src Merge branch 'master' of https://git01.codeplex.com/forks/wlawski/keepass2android into wlawski 2014-12-14 07:29:29 +01:00
.gitignore Merge branch 'master' of https://git01.codeplex.com/forks/wlawski/keepass2android into wlawski 2014-12-14 07:29:29 +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