Philipp Crocoll a626521f97 Merge branch 'wlawski' ...

Conflicts:
	src/keepass2android/Resources/Resource.designer.cs

2014-12-17 20:29:01 +01:00

..

Collections

Merge branch 'kplibdesktop' into integrate_kplib_2_24_update

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

Cryptography

Merge branch 'kplibdesktop' into integrate_kplib_2_24_update

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

Delegates

update 2.24 Copyright headers

2013-11-13 03:32:12 +01:00

Interfaces

Merge branch 'kplibdesktop' into integrate_kplib_2_24_update

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

Keys

Fixes in PasswordActivity:

2014-12-17 05:58:55 +01:00

Native

Release 0.9.3-pre2

2014-01-27 08:03:58 -08:00

Properties

update to 2.24

2013-11-13 03:29:48 +01:00

Resources

.gitignore: Do not track Resource designer files

2014-08-31 09:14:36 +02:00

Security

Merge branch 'kplibdesktop' into integrate_kplib_2_24_update

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

Serialization

fixed issue loading kdb files with key file

2014-11-11 17:23:01 +01:00

Translation

Merge branch 'kplibdesktop' into integrate_kplib_2_24_update

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

Utility

Merge branch 'kplibdesktop' into integrate_kplib_2_24_update

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

.gitignore

Unmodified KeepassLib from KeePass Desktop v2.20

2013-02-23 14:24:43 +01:00

IDatabaseLoader.cs

Added message that kdb-support is readonly

2014-03-25 06:15:05 +01:00

KeePassLib2Android.csproj

Merge branch 'wlawski'

2014-12-17 20:29:01 +01:00

KeePassLib.pfx

Unmodified KeepassLib from KeePass Desktop v2.20

2013-02-23 14:24:43 +01:00

Kp2aLog.cs

improved error handling for dropbox filestorage

2013-09-17 06:53:18 +02:00

PwCustomIcon.cs

Merge branch 'kplibdesktop' into integrate_kplib_2_24_update

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

PwDatabase.cs

added parts of Keepassdroid for loading a kdb file.

2014-01-25 19:36:22 -08:00

PwDefs.cs

update to 2.24

2013-11-13 03:29:48 +01:00

PwDeletedObject.cs

update 2.24 Copyright headers

2013-11-13 03:32:12 +01:00

PwEntry.cs

Merge branch 'kplibdesktop' into integrate_kplib_2_24_update

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

PwEnums.cs

update to 2.24

2013-11-13 03:29:48 +01:00

PwGroup.cs

Bugfix: crash when ":" in key string of protected fields

2014-01-02 20:30:15 +01:00

PwUuid.cs

Merge branch 'kplibdesktop' into integrate_kplib_2_24_update

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