Merge branch 'UITesting'

Conflicts:
	.gitignore
	src/KeePass.sln
	src/keepass2android/EntryActivity.cs
	src/keepass2android/Resources/Resource.designer.cs
	src/keepass2android/keepass2android.csproj
This commit is contained in:
Philipp Crocoll
2013-04-26 12:08:50 +02:00
93 changed files with 3613 additions and 1899 deletions

1
.gitignore vendored
View File

@@ -25,3 +25,4 @@
/src/java/KP2ASoftKeyboard/gen
/src/java/KP2ASoftKeyboard/projectzip
/src/java/KP2ASoftKeyboard/createProjectZip.bat
Thumbs.db