diff options
author | Stef Walter <stef@memberwebs.com> | 2009-11-24 16:26:06 +0000 |
---|---|---|
committer | Stef Walter <stef@memberwebs.com> | 2009-11-24 16:26:06 +0000 |
commit | 996db6eebd41f5aaf2da9bb272a76be33d45666f (patch) | |
tree | 9538c091ab66ee0572b71ca61f33e6c7b14842f9 /.gitignore | |
parent | ace62caa70c2ba2a8fe2a1aa8681f708704bc7ab (diff) | |
parent | 1f225859713c8fae6d5b58e4d61cfe442e93cc8a (diff) | |
download | gnome-keyring-996db6eebd41f5aaf2da9bb272a76be33d45666f.tar.gz |
Merge branch 'master' into dbus-api
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -27,7 +27,7 @@ run-prompt-test* *-marshal.[ch] .libs .deps - +.anjuta* /compile /ABOUT-NLS /aclocal.m4 |