diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-29 11:29:57 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-29 14:15:33 +0100 |
| commit | 811349d4a8375da36edb5e9b33ba41b3900da0ec (patch) | |
| tree | b86745d388ed89f76bda570f99e0f4a75af1f9f8 /.gitignore | |
| parent | 2d1aa9be4697824ae0780a7f90ee5eb1fbcdc8d1 (diff) | |
| parent | 07e7c3d2768fe85eb2815aa93d695291565f931e (diff) | |
Merge remote-tracking branch 'origin/master' into next-merge
Conflicts were pretty hardcore:
- all the spec conflicts have been resolved with --ours as I just synced on
the latest version of spec-next (0.99.4)
- docs conflicts have been solved manually while updating to the new API
symbols.
- telepathy-glib/contact.c was a nightmare to solve...
Conflicts:
NEWS
configure.ac
docs/reference/telepathy-glib-docs.sgml
docs/reference/telepathy-glib-sections.txt
spec/Channel_Dispatcher_Interface_Messages1.xml
spec/Connection_Interface_IRC_Command1.xml
spec/Connection_Interface_Renaming1.xml
spec/Makefile.am
spec/all.xml
telepathy-glib/abi.am
telepathy-glib/account-manager.c
telepathy-glib/account.c
telepathy-glib/channel-dispatcher.xml
telepathy-glib/connection.xml
telepathy-glib/contact.c
telepathy-glib/extra-gtkdoc.h
telepathy-glib/util.c
telepathy-glib/util.h
tests/lib/simple-account.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f598c48fa..c5288b726 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ FIXME.out INSTALL aclocal.m4 autom4te.cache +/build-aux config.guess config.h config.h.in |