diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-13 12:02:02 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-13 12:03:30 +0000 |
| commit | cbf3bac0c6709163ca70b2ed2535828503245822 (patch) | |
| tree | 19102ab3b821af317c54dab90c8d4bdcc22ef72c /.gitignore | |
| parent | dd3a64191c76337c8f753ff04842282dd0822fb9 (diff) | |
| parent | c371d0f0713f6fa348bfb2974953e27742caa082 (diff) | |
Merge branch 'add-farstream' into next
Reviewed-by: Olivier Crête
Tested-by: nobody (<https://bugs.freedesktop.org/show_bug.cgi?id=73551>)
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73409
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index bf24ee63a..dd57d97f9 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ Makefile *.rej *.bak *~ +*.stamp *.pyc *.pyo *.loT @@ -43,6 +44,7 @@ depcomp /data/*.service /data/org.freedesktop.Telepathy.Logger.gschema.valid /data/org.freedesktop.Telepathy.Logger.gschema.xml + /docs/reference/libtelepathy-logger/*.stamp /docs/reference/libtelepathy-logger/*.bak /docs/reference/libtelepathy-logger/html/ @@ -72,6 +74,22 @@ depcomp /docs/reference/telepathy-glib/html /docs/reference/telepathy-glib/tmpl/*.sgml /docs/reference/telepathy-glib/xml +/docs/reference/telepathy-farstream/*.bak +/docs/reference/telepathy-farstream/html/ +/docs/reference/telepathy-farstream/telepathy-farstream.args +/docs/reference/telepathy-farstream/telepathy-farstream-decl-list.txt +/docs/reference/telepathy-farstream/telepathy-farstream-decl.txt +/docs/reference/telepathy-farstream/telepathy-farstream.hierarchy +/docs/reference/telepathy-farstream/telepathy-farstream.interfaces +/docs/reference/telepathy-farstream/telepathy-farstream-overrides.txt +/docs/reference/telepathy-farstream/telepathy-farstream.prerequisites +/docs/reference/telepathy-farstream/telepathy-farstream.signals +/docs/reference/telepathy-farstream/telepathy-farstream-undeclared.txt +/docs/reference/telepathy-farstream/telepathy-farstream-undocumented.txt +/docs/reference/telepathy-farstream/telepathy-farstream-unused.txt +/docs/reference/telepathy-farstream/tmpl/ +/docs/reference/telepathy-farstream/xml/ + examples/client/telepathy-example-* examples/cm/*/telepathy-example-* examples/extensions/extensions.html @@ -106,9 +124,15 @@ missing stamp-h1 /TAGS tags + +/telepathy-farstream/examples/call-handler +/telepathy-farstream/telepathy-farstream-1.pc +/telepathy-farstream/telepathy-farstream-uninstalled-1.pc + /telepathy-glib-0.* /telepathy-glib/tmp-introspect*/ telepathy-glib/version.h + /telepathy-logger/extensions/tpl-extensions.pc /telepathy-logger/extensions/_gen/ /telepathy-logger/extensions/doc/ @@ -120,6 +144,7 @@ telepathy-glib/version.h /telepathy-logger/TelepathyLogger-1.gir /telepathy-logger/_gen/ /telepathy-logger/tpl-marshal.[ch] + /test-driver tests/dbus/dbus-installed/session.conf tests/dbus/dbus-uninstalled/session.conf |