diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-03-15 13:44:34 +0000 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-03-15 13:44:34 +0000 |
| commit | 0eba2ffb56ed5f612e6d2a9657fe38522a3bd2b1 (patch) | |
| tree | db00c0a890a7e4b322a15908f09ba9cc4ffd4c36 /.gitignore | |
| parent | c98fa2f0585d1752db4c37af6ea9abcb13c31ff3 (diff) | |
| parent | 627a15ea32138a4406dc2bd8c29e879b1a8f14e9 (diff) | |
Merge branch 'plugin'
Conflicts:
.gitignore
configure.ac
tests/Makefile.am
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -149,13 +149,5 @@ lib/gibber/tests/sasl-test.db lib/gibber/tests/test-xmpp-connection lib/gibber/tests/test-r-multicast-transport-io -lib/gibber/tests/check-gibber-iq-helper -lib/gibber/tests/check-gibber-listener -lib/gibber/tests/check-gibber-r-multicast-causal-transport -lib/gibber/tests/check-gibber-r-multicast-packet -lib/gibber/tests/check-gibber-r-multicast-sender -lib/gibber/tests/check-gibber-unix-transport -lib/gibber/tests/check-gibber-xmpp-connection -lib/gibber/tests/check-gibber-xmpp-connection-listener -lib/gibber/tests/check-gibber-xmpp-error -lib/gibber/tests/check-gibber-xmpp-reader +salut/telepathy-salut.pc +salut/telepathy-salut-uninstalled.pc |