diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-31 16:47:55 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-31 16:47:55 +0000 |
| commit | ae86b52c435aa39b78ae14cb23a75e4e639b0d5a (patch) | |
| tree | b526eda7fda8d3469e1db44ea258f3065017d9a7 /.gitignore | |
| parent | bd2903877be3a3bd38a2a3fff6bd6e8d030e7306 (diff) | |
| parent | 301d3d7d9b0f025d71390dbc9211923308e4386b (diff) | |
Merge remote-tracking branch 'mylogger/next' into next
Conflicts:
.gitignore
COPYING
Makefile.am
autogen.sh
configure.ac
docs/Makefile.am
docs/reference/Makefile.am
m4/tp-compiler-flag.m4
m4/tp-compiler-warnings.m4
tests/Makefile.am
tests/lib/Makefile.am
tests/lib/simple-account.c
tests/lib/simple-account.h
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index bf290d652..776dd86fb 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ Makefile *.bak *~ *.pyc +*.pyo *.loT *.gir *.typelib @@ -27,15 +28,34 @@ INSTALL aclocal.m4 autom4te.cache /build-aux +/ChangeLog config.guess config.h config.h.in +/config.h.in~ config.log config.status config.sub configure cscope.out depcomp +/data/*.client +/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/ +/docs/reference/libtelepathy-logger/telepathy-logger-*.bak +/docs/reference/libtelepathy-logger/telepathy-logger-*.txt +/docs/reference/libtelepathy-logger/telepathy-logger.args +/docs/reference/libtelepathy-logger/telepathy-logger.hierarchy +/docs/reference/libtelepathy-logger/telepathy-logger.interfaces +/docs/reference/libtelepathy-logger/telepathy-logger.prerequisites +/docs/reference/libtelepathy-logger/telepathy-logger.signals +/docs/reference/libtelepathy-logger/telepathy-logger.types +/docs/reference/libtelepathy-logger/tmpl/ +/docs/reference/libtelepathy-logger/xml/ /docs/reference/telepathy-glib/*-decl.txt /docs/reference/telepathy-glib/*-decl-list.txt /docs/reference/telepathy-glib/*-undeclared.txt @@ -62,7 +82,11 @@ examples/client/stream-tubes/accepter examples/client/stream-tubes/offerer /extensions/extensions.html gtk-doc.make +/INSTALL install-sh +/intltool-extract.in +/intltool-merge.in +/intltool-update.in lcov.info lcov.info.tmp lcov.html @@ -75,18 +99,36 @@ m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 missing +/po/Makefile.in.in +/po/POTFILES +/po/stamp-it /release-mail stamp-h1 +/TAGS tags /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/ +/telepathy-logger/telepathy-logger +/telepathy-logger/test-api +/telepathy-logger/telepathy-logger-1-uninstalled.pc +/telepathy-logger/telepathy-logger-1.pc +/telepathy-logger/TelepathyLogger1-1.typelib +/telepathy-logger/TelepathyLogger1-1.gir +/telepathy-logger/_gen/ +/telepathy-logger/tpl-marshal.[ch] /test-driver tests/dbus/dbus-installed/session.conf tests/dbus/dbus-uninstalled/session.conf tests/dbus/run-test.sh tests/dbus/test-* tests/dbus/tpglib-dbus-tests.list +/tests/logger/test-*[^ch] +/tests/logger/dbus/test-*[^ch] +/tests/logger/dbus/dbus-1/session.conf tests/test-* /tests/tools/actual.h /tests/tools/actual-body.h |