Philipp Crocoll 1b84707970 Merge branch 'kplibdesktop' into integrate_kplib_2_24_update ...

Conflicts:
	src/KeePassLib2Android/Cryptography/CryptoRandom.cs
	src/KeePassLib2Android/Keys/KcpKeyFile.cs
	src/KeePassLib2Android/Keys/KcpUserAccount.cs
	src/KeePassLib2Android/Native/NativeLib.cs
	src/KeePassLib2Android/PwCustomIcon.cs
	src/KeePassLib2Android/PwDatabase.cs
	src/KeePassLib2Android/PwEntry.cs
	src/KeePassLib2Android/PwGroup.cs
	src/KeePassLib2Android/PwUuid.cs
	src/KeePassLib2Android/Security/ProtectedBinary.cs
	src/KeePassLib2Android/Serialization/FileLock.cs
	src/KeePassLib2Android/Serialization/FileTransactionEx.cs
	src/KeePassLib2Android/Serialization/HashedBlockStream.cs
	src/KeePassLib2Android/Serialization/IOConnection.cs
	src/KeePassLib2Android/Serialization/KdbxFile.Read.Streamed.cs
	src/KeePassLib2Android/Serialization/KdbxFile.Read.cs
	src/KeePassLib2Android/Serialization/KdbxFile.Write.cs
	src/KeePassLib2Android/Translation/KPControlCustomization.cs
	src/KeePassLib2Android/Translation/KPFormCustomization.cs
	src/KeePassLib2Android/Translation/KPStringTable.cs
	src/KeePassLib2Android/Translation/KPTranslation.cs
	src/KeePassLib2Android/Utility/GfxUtil.cs
	src/KeePassLib2Android/Utility/MessageService.cs
	src/KeePassLib2Android/Utility/StrUtil.cs

2013-11-13 04:13:27 +01:00

src

Merge branch 'kplibdesktop' into integrate_kplib_2_24_update

2013-11-13 04:13:27 +01:00

.gitignore

fixed layout problem in text_with_help.xml

2013-10-14 20:56:23 +02:00

CONTRIBUTORS

initial release 0.5.0 BETA

2013-02-23 17:45:00 +01:00

COPYING.gpl-2.0

initial release 0.5.0 BETA

2013-02-23 17:45:00 +01:00

LICENSE

initial release 0.5.0 BETA

2013-02-23 17:45:00 +01:00

Description

Password manager app for Android

androidkeepasskeepass2keepass2androidpassword-manager

92 MiB

Languages

C# 51.4%

Java 36.2%

C 8.1%

Assembly 2.5%

C++ 1.5%

Other 0.3%