Philipp Crocoll c7cf120c1d Merge branch 'master' into MaterialDesign ...

Conflicts:
	src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj
	src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
	src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj
	src/KeePass.sln
	src/KeePassLib2Android/KeePassLib2Android.csproj
	src/PluginSdkBinding/PluginSdkBinding.csproj
	src/keepass2android/AboutActivity.cs
	src/keepass2android/ExportDatabaseActivity.cs
	src/keepass2android/GroupActivity.cs
	src/keepass2android/GroupBaseActivity.cs
	src/keepass2android/Properties/AndroidManifest_net.xml
	src/keepass2android/keepass2android.csproj
	src/keepass2android/search/SearchProvider.cs

2015-09-04 05:34:27 +02:00

src

Merge branch 'master' into MaterialDesign

2015-09-04 05:34:27 +02:00

.gitignore

Make sure "duplicate UUID" error is not repeated after fixing the db

2015-02-20 21:12:49 +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

Description

No description provided

34 MiB

Languages

Java 59%

C# 34.1%

C 4.8%

Assembly 1.9%

C++ 0.1%