Go to file
Philipp Crocoll 2cb6c79f0c Merge branch 'master' into Branch_KeeChallenge
Conflicts:
	src/KeePassLib2Android/KeePassLib2Android.csproj
	src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
	src/keepass2android/Properties/AndroidManifest_nonet.xml
	src/keepass2android/Resources/Resource.designer.cs
	src/keepass2android/keepass2android.csproj
2014-04-02 06:28:16 +02:00
src Merge branch 'master' into Branch_KeeChallenge 2014-04-02 06:28:16 +02:00
.gitignore repo cleanup 2014-03-24 07:04:23 +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