summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-04-21 09:37:58 +0200
committerStef Walter <stefw@collabora.co.uk>2011-04-21 09:37:58 +0200
commit2a45c4bc0bb500d6e33f237d73568671a01c4d64 (patch)
treee28376d6f714764673def5d7eff64ec98b516fff /.gitignore
parent1cfa84f0e80905017a17db4be5dd1416014a504c (diff)
parent433e014654564fb7dfe013c7968c4b9c027a6f34 (diff)
downloadgnome-keyring-2a45c4bc0bb500d6e33f237d73568671a01c4d64.tar.gz
Merge branch 'gnome-3-0'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index af16c8c4..89c20c9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,6 +87,7 @@ run-tests
/egg/tests/test-dh
/egg/tests/test-dn
/egg/tests/test-hex
+/egg/tests/test-hkdf
/egg/tests/test-oid
/egg/tests/test-openssl
/egg/tests/test-padding