diff options
author | Werner Koch <[email protected]> | 2013-02-12 18:17:42 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2013-02-12 18:17:42 +0000 |
commit | caddeef4a7ffe5f2eb6453d364b6ae152e0f6625 (patch) | |
tree | 5894e3f0e365b0c9035efecea2bbd5ad3042ca51 /scd/app.c | |
parent | kbx: Switch from MD5 to SHA-1 for the checksum. (diff) | |
parent | gpg: Implement card_store_subkey again. (diff) | |
download | gnupg-caddeef4a7ffe5f2eb6453d364b6ae152e0f6625.tar.gz gnupg-caddeef4a7ffe5f2eb6453d364b6ae152e0f6625.zip |
Merge branch 'master' into key-storage-work
Diffstat (limited to '')
-rw-r--r-- | scd/app.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -26,8 +26,8 @@ #include "scdaemon.h" #include "app-common.h" -#include "apdu.h" #include "iso7816.h" +#include "apdu.h" #include "tlv.h" /* This table is used to keep track of locks on a per reader base. |