summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-04-05 15:52:50 +0200
committerStef Walter <stefw@collabora.co.uk>2011-07-06 16:44:19 +0200
commitc509fbddecb86b61e58943c22a7bddc42ccca229 (patch)
treec1956eeccba24547dc29492439632bbcfcf8b5a9 /.gitignore
parentde7b628ac6e501b200500e42a6d1f169915e2779 (diff)
downloadgnome-keyring-c509fbddecb86b61e58943c22a7bddc42ccca229.tar.gz
Install a proper p11-kit module configuration file
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index c7761998..124bc137 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,6 +110,7 @@ run-tests
/gck/tests/test-gck-slot
/gck/tests/test-gck-uri
+<<<<<<< HEAD
/gcr/tests/frob-certificate
/gcr/tests/frob-key
/gcr/tests/frob-gnupg-selector
@@ -151,6 +152,8 @@ run-tests
/pkcs11/roots-store/tests/check-roots-module
+/pkcs11/rpc-layer/gnome-keyring-module
+
/pkcs11/secret-store/tests/test-secret-binary
/pkcs11/secret-store/tests/test-secret-collection
/pkcs11/secret-store/tests/test-secret-compat
@@ -179,12 +182,11 @@ run-tests
/pkcs11/xdg-store/tests/test-xdg-module
/pkcs11/xdg-store/tests/test-xdg-trust
-/ui/tests/test-util
-
/daemon/dbus/tests/test-secret-util
/ui/gnome-keyring-prompt.desktop
/ui/gnome-keyring-prompt.desktop.in
+/ui/tests/test-util
/docs/reference/*/*-scan
/docs/reference/*/*-scan.c