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
2013-04-26 12:08:50 +02:00
2013-04-26 12:08:50 +02:00
2013-02-23 17:45:00 +01:00
2013-02-23 17:45:00 +01:00
2013-02-23 17:45:00 +01:00
Description
No description provided
34 MiB
Languages
Java 59%
C# 34.1%
C 4.8%
Assembly 1.9%
C++ 0.1%