[empathy: 12/12] Merge branch 'profile-chooser'
- From: Jonny Lamb <jonnylamb src gnome org>
- To: svn-commits-list gnome org
- Subject: [empathy: 12/12] Merge branch 'profile-chooser'
- Date: Sun, 7 Jun 2009 09:36:39 -0400 (EDT)
commit d440d9ab734b45ffc651750a3d317e299c851821
Merge: 396aff9... 138ec18...
Author: Jonny Lamb <jonny lamb collabora co uk>
Date: Sun Jun 7 14:35:11 2009 +0100
Merge branch 'profile-chooser'
docs/libempathy-gtk/libempathy-gtk.types | 1 +
libempathy-gtk/empathy-profile-chooser.c | 425 ++++++++++++++++++------------
libempathy-gtk/empathy-profile-chooser.h | 51 +++-
python/pyempathygtk/pyempathygtk.defs | 24 ++-
src/empathy-accounts-dialog.c | 9 +-
tests/.gitignore | 1 +
tests/Makefile.am | 4 +-
tests/test-empathy-profile-chooser.c | 31 +++
8 files changed, 353 insertions(+), 193 deletions(-)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]