Dominik Schürmann 64e85a2eb4 Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card ...

Conflicts:
	Graphics/get-material-icons.sh
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
	OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml

2015-03-10 01:51:30 +01:00

..

src/main

Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card

2015-03-10 01:51:30 +01:00

.gitignore

…

build.gradle

Update patternview lib, remove workaround

2015-03-03 15:56:03 +01:00