diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-02-12 15:55:11 +0000 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-02-12 15:55:11 +0000 |
| commit | 15c21b8180b8c782d90e3a1a58437c2b0ecacbe8 (patch) | |
| tree | aba6d0166b7cb812ae5955549d651902191ef2df /.gitignore | |
| parent | 8695678c5c6792ac1b055dd121e3c68caec1ff48 (diff) | |
| parent | af7c215cfc4ddd45f8abd67ba90a7ef2fdef000c (diff) | |
| download | telepathy-salut-15c21b8180b8c782d90e3a1a58437c2b0ecacbe8.tar.gz | |
Merge branch 'master' into requestotron-tubes-and-caps-with-complex-types-with-gibber-listener-REBASED
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -109,7 +109,6 @@ src/write-mgr-file stamp-h1 telepathy-salut-*.tar.gz tests/check-main -tests/sasl-test.db tests/test-r-multicast-{packet,sender,transport-io} tests/twisted/config.py tests/twisted/tools/core @@ -133,5 +132,6 @@ tests/telepathy-salut-debug lib/gibber/tests/check-main lib/gibber/tests/outputs +lib/gibber/tests/sasl-test.db lib/gibber/tests/test-xmpp-connection lib/gibber/tests/test-r-multicast-transport-io |