diff options
| author | Cosimo Alfarano <cosimo.alfarano@collabora.co.uk> | 2010-02-10 16:11:18 +0000 |
|---|---|---|
| committer | Cosimo Alfarano <cosimo.alfarano@collabora.co.uk> | 2010-02-10 16:11:18 +0000 |
| commit | c66c9581c54fd5ff73460aed0d9c7f13757ed613 (patch) | |
| tree | e86fbabb5e06d6876c6e5ae0ea5c2d9c8aade694 /.gitignore | |
| parent | ab3a1484a8fa68d82872b4b78f8fe09877208aa4 (diff) | |
| parent | b3421946e58d45dfa89b2c21f453d7d061d947a6 (diff) | |
| download | telepathy-logger-c66c9581c54fd5ff73460aed0d9c7f13757ed613.tar.gz | |
Merge branch 'master' of git+ssh://git.collabora.co.uk/git/telepathy-logger
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -23,6 +23,7 @@ shave-libtool libtool stamp-h1 gtk-doc.make +INSTALL config.* *~ |