[empathy: 5/5] Merge branch 'conference-tp-glib-630709'
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 5/5] Merge branch 'conference-tp-glib-630709'
- Date: Wed, 29 Sep 2010 15:37:59 +0000 (UTC)
commit b68e00fd8bba2dec6140eaa45be99f3cf9e8287b
Merge: f83fcfb 204eecf
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed Sep 29 17:37:26 2010 +0200
Merge branch 'conference-tp-glib-630709'
configure.ac | 2 +-
extensions/Channel_Interface_Conference.xml | 635 ---------------------------
extensions/Makefile.am | 1 -
extensions/misc.xml | 1 -
libempathy/empathy-tp-chat.c | 12 +-
5 files changed, 7 insertions(+), 644 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
