summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-09-03 10:23:48 +0200
committerKoen Kooi <koen@openembedded.org>2009-09-03 10:23:48 +0200
commit7457196b2069b189f9c25a0d2f90e84df219f184 (patch)
treeca80ecafccd8f3b8bc3feb8ba869f47a177fb979 /.gitignore
parentc73cd5fdeb25c5cd4cfa316e2dd59304a776f7af (diff)
gnome-keyring: fix merge error
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions