moparisthebest/keepass2android
1
0
Fork 0
mirror of https://github.com/moparisthebest/keepass2android synced 2024-11-13 21:15:09 -05:00
Code Issues Releases Wiki Activity
3159af19cb
keepass2android/src/KeePassLib2Android/Translation
History
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
..
KPControlCustomization.cs Merge branch 'kplibdesktop' into integrate_kplib_2_24_update 2013-11-13 04:13:27 +01:00
KPFormCustomization.cs Merge branch 'kplibdesktop' into integrate_kplib_2_24_update 2013-11-13 04:13:27 +01:00
KPStringTable.cs Merge branch 'kplibdesktop' into integrate_kplib_2_24_update 2013-11-13 04:13:27 +01:00
KPStringTableItem.cs update 2.24 Copyright headers 2013-11-13 03:32:12 +01:00
KPTranslation.cs Merge branch 'kplibdesktop' into integrate_kplib_2_24_update 2013-11-13 04:13:27 +01:00
KPTranslationProperties.cs update 2.24 Copyright headers 2013-11-13 03:32:12 +01:00