diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-04-18 13:36:01 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-04-18 13:36:01 +0200 |
| commit | e4faefb8ed07f6e6fa220c96c4591bc7b5f004e7 (patch) | |
| tree | 5392b1a7c52adc3cc5976578f05a2c9a56811519 /.gitignore | |
| parent | c0dc9725f6674090e05301b9fb8b4295be468d6a (diff) | |
| parent | 00052136a0fd42b23956dfd76892912f7fb58e00 (diff) | |
| download | gnome-keyring-e4faefb8ed07f6e6fa220c96c4591bc7b5f004e7.tar.gz | |
Merge branch 'gnome-3-0'
Conflicts:
docs/reference/gcr/gcr-sections.txt
gcr/Makefile.am
gcr/gcr-library.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -115,6 +115,19 @@ run-tests /gcr/tests/test-simple-certificate /gcr/tests/test-trust +/pkcs11/gkm/tests/test-attributes +/pkcs11/gkm/tests/test-credential +/pkcs11/gkm/tests/test-data-asn1 +/pkcs11/gkm/tests/test-data-der +/pkcs11/gkm/tests/test-file-tracker +/pkcs11/gkm/tests/test-memory-store +/pkcs11/gkm/tests/test-object +/pkcs11/gkm/tests/test-secret +/pkcs11/gkm/tests/test-sexp +/pkcs11/gkm/tests/test-store +/pkcs11/gkm/tests/test-timer +/pkcs11/gkm/tests/test-transaction + /daemon/dbus/tests/test-secret-util /ui/gnome-keyring-prompt.desktop |