Go to file
Philipp Crocoll 370c937578 Merge branch 'AlexVallat/Keepass2AndroidPerfOpt'
Conflicts:
	src/KeePassLib2Android/Serialization/IOConnection.cs
	src/Kp2aBusinessLogic/IKp2aApp.cs
	src/Kp2aBusinessLogic/database/Database.cs
	src/keepass2android/Resources/Resource.designer.cs
	src/keepass2android/app/App.cs
	src/keepass2android/fileselect/FileSelectActivity.cs
2013-08-10 20:25:10 +02:00
src Merge branch 'AlexVallat/Keepass2AndroidPerfOpt' 2013-08-10 20:25:10 +02:00
.gitignore Merge branch 'AlexVallat/Keepass2AndroidPerfOpt' 2013-08-10 20:25:10 +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