Merge branch 'master' of github.com:dopefishh/dotfiles

[dotfiles.git] / pgp / .gnupg / gpg-agent.conf

diff --git a/pgp/.gnupg/gpg-agent.conf b/pgp/.gnupg/gpg-agent.conf
index 7c2333f..5a04fc4 100644 (file)
--- a/pgp/.gnupg/gpg-agent.conf
+++ b/pgp/.gnupg/gpg-agent.conf
@@ -1,3 +1,4 @@
-pinentry-program /usr/bin/pinentry-qt4
+pinentry-program /usr/bin/pinentry-qt
 default-cache-ttl 3600
 enable-ssh-support
+disable-scdaemon