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
..
Cipher	update 2.24 Copyright headers	2013-11-13 03:32:12 +01:00
PasswordGenerator	update 2.24 Copyright headers	2013-11-13 03:32:12 +01:00
CryptoRandom.cs	Merge branch 'kplibdesktop' into integrate_kplib_2_24_update	2013-11-13 04:13:27 +01:00
CryptoRandomStream.cs	update 2.24 Copyright headers	2013-11-13 03:32:12 +01:00
HashingStreamEx.cs	update to 2.24	2013-11-13 03:29:48 +01:00
HmacOtp.cs	update to 2.24	2013-11-13 03:29:48 +01:00
PopularPasswords.cs	update to 2.24	2013-11-13 03:29:48 +01:00
QualityEstimation.cs	update to 2.24	2013-11-13 03:29:48 +01:00
SelfTest.cs	update to 2.24	2013-11-13 03:29:48 +01:00