Go to file
Philipp Crocoll fa4cd5bf46 Merge branch 'UITesting'
Conflicts:
	.gitignore
	src/KeePass.sln
	src/keepass2android/EntryActivity.cs
	src/keepass2android/Resources/Resource.designer.cs
	src/keepass2android/keepass2android.csproj
2013-04-26 12:08:50 +02:00
src Merge branch 'UITesting' 2013-04-26 12:08:50 +02:00
.gitignore Merge branch 'UITesting' 2013-04-26 12:08:50 +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