diff options
author | Werner Koch <wk@gnupg.org> | 2013-03-20 10:00:12 +0100 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2013-03-20 10:00:12 +0100 |
commit | eaa6dc3a8b4f31525650cd4785d6bafab86d68b7 (patch) | |
tree | 6552e846c825e2dae78d5ceefebee0e2acaeb27f /.gitignore | |
parent | Add code to allow for late memory cleanup. (diff) | |
parent | gpg: Print indicator for unknown key capability. (diff) | |
download | gnupg2-eaa6dc3a8b4f31525650cd4785d6bafab86d68b7.tar.xz gnupg2-eaa6dc3a8b4f31525650cd4785d6bafab86d68b7.zip |
Merge branch 'master' into key-storage-work
--
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index d3a576aa4..6502072e7 100644 --- a/.gitignore +++ b/.gitignore @@ -154,7 +154,5 @@ tools/mk-tdata tools/symcryptrun tools/watchgnupg tools/gpgtar - - +private-keys-v1.d/ x.parm -private-keys-v1.d/
\ No newline at end of file |