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