summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-06 17:17:26 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-06 17:17:26 +0200
commitb889803a833eab6e65d15d3f806c90376932bfba (patch)
tree3eca9f69950b7226f5736336272e5f2a60c5d35b /.gitignore
parent0f2ab6850d1b8e9a0808003ee480db2acd2f876b (diff)
parenta9df354fbfd05a9b797033db42523f3177eac107 (diff)
downloadtelepathy-glib-b889803a833eab6e65d15d3f806c90376932bfba.tar.gz
Merge branch 'tp-stream-tube-29218'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 6ba0a00bc..05d4c46f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,8 @@ examples/client/telepathy-example-*
examples/cm/*/telepathy-example-*
examples/extensions/extensions.html
/examples/future/*/telepathy-example-*
+examples/client/stream-tubes/accepter
+examples/client/stream-tubes/offerer
/extensions/extensions.html
gtk-doc.make
install-sh