[next] telepathy-glib: Merge commit ' 3aaacd5566e2edc602870f86e89a3961aff6363c' into next
Xavier Claessens
xclaesse at kemper.freedesktop.org
Wed Sep 25 12:50:24 PDT 2013
Module: telepathy-glib
Branch: next
Commit: 68efbc58ba8dae590a3be5d98c98cfa742d810d8
URL: http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=68efbc58ba8dae590a3be5d98c98cfa742d810d8
Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date: Wed Sep 25 15:33:59 2013 -0400
Merge commit '3aaacd5566e2edc602870f86e89a3961aff6363c' into next
Conflicts:
NEWS
spec/Channel_Type_Room_List1.xml
spec/Connection.xml
spec/all.xml
telepathy-glib/abi.am
telepathy-glib/dbus-properties-mixin.c
telepathy-glib/dbus-properties-mixin.h
---
More information about the telepathy-commits
mailing list