empathy r327 - in branches/EMPATHY_VOIP: . libempathy libempathy-gtk po tests

[xclaesse svn gnome org]

Author: xclaesse
Date: 2007-09-28 09:31:10 +0100 (Fri, 28 Sep 2007)
New Revision: 327
ViewCVS link: http://svn.gnome.org/viewcvs/empathy?rev=327&view=rev

Modified:
   branches/EMPATHY_VOIP/ChangeLog
   branches/EMPATHY_VOIP/libempathy-gtk/empathy-main-window.c
   branches/EMPATHY_VOIP/libempathy-gtk/empathy-profile-chooser.c
   branches/EMPATHY_VOIP/libempathy/empathy-avatar.c
   branches/EMPATHY_VOIP/libempathy/empathy-avatar.h
   branches/EMPATHY_VOIP/libempathy/empathy-contact-factory.c
   branches/EMPATHY_VOIP/libempathy/empathy-tp-group.c
   branches/EMPATHY_VOIP/libempathy/empathy-utils.c
   branches/EMPATHY_VOIP/libempathy/empathy-utils.h
   branches/EMPATHY_VOIP/po/ChangeLog
   branches/EMPATHY_VOIP/po/es.po
   branches/EMPATHY_VOIP/tests/Makefile.am
   branches/EMPATHY_VOIP/tests/contact-manager.c
Log:
svn merge -r 314:head svn+ssh://xclaesse svn gnome org/svn/empathy/trunk