diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-05-24 09:30:58 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-05-24 09:30:58 +0200 |
| commit | 2468d94afdd30afa9713abd8d35a36046aababe7 (patch) | |
| tree | d79ba127546312a573976f14ff809ff253c5d30f /.gitignore | |
| parent | 1705a8555b8c3776eabe366b0f7c51b2b4dcf6be (diff) | |
| parent | 7b5e4e3c1e8cf94a03f1bd21eacb53991b32f6c6 (diff) | |
| download | gnome-keyring-2468d94afdd30afa9713abd8d35a36046aababe7.tar.gz | |
Merge branch 'split-selector'
Conflicts:
gcr/Makefile.am
gcr/gcr-collection-model.c
gcr/gcr-tree-selector.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -114,6 +114,8 @@ run-tests /gcr/tests/frob-key /gcr/tests/frob-gnupg-selector /gcr/tests/frob-selector +/gcr/tests/frob-combo-selector +/gcr/tests/frob-tree-selector /gcr/tests/frob-unlock-options /gcr/tests/frob-parser /gcr/tests/test-certificate |