summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2013-03-20 10:00:12 +0100
committerWerner Koch <wk@gnupg.org>2013-03-20 10:00:12 +0100
commiteaa6dc3a8b4f31525650cd4785d6bafab86d68b7 (patch)
tree6552e846c825e2dae78d5ceefebee0e2acaeb27f /.gitignore
parentAdd code to allow for late memory cleanup. (diff)
parentgpg: Print indicator for unknown key capability. (diff)
downloadgnupg2-eaa6dc3a8b4f31525650cd4785d6bafab86d68b7.tar.xz
gnupg2-eaa6dc3a8b4f31525650cd4785d6bafab86d68b7.zip
Merge branch 'master' into key-storage-work
--
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
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