empathy r455 - in trunk: . libempathy libempathy-gtk python/pyempathy src

[xclaesse svn gnome org]

Author: xclaesse
Date: 2007-12-02 22:38:02 +0000 (Sun, 02 Dec 2007)
New Revision: 455
ViewCVS link: http://svn.gnome.org/viewcvs/empathy?rev=455&view=rev

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/libempathy-gtk/empathy-account-chooser.c
   trunk/libempathy-gtk/empathy-accounts-dialog.c
   trunk/libempathy-gtk/empathy-chat.c
   trunk/libempathy-gtk/empathy-contact-dialogs.c
   trunk/libempathy-gtk/empathy-group-chat.c
   trunk/libempathy-gtk/empathy-main-window.c
   trunk/libempathy-gtk/empathy-presence-chooser.c
   trunk/libempathy-gtk/empathy-status-presets.c
   trunk/libempathy/empathy-avatar.c
   trunk/libempathy/empathy-contact-factory.c
   trunk/libempathy/empathy-contact-manager.c
   trunk/libempathy/empathy-tp-call.c
   trunk/libempathy/empathy-tp-chat.c
   trunk/libempathy/empathy-tp-chat.h
   trunk/libempathy/empathy-tp-contact-list.c
   trunk/libempathy/empathy-tp-group.c
   trunk/libempathy/empathy-tp-roomlist.c
   trunk/libempathy/empathy-utils.c
   trunk/libempathy/empathy-utils.h
   trunk/python/pyempathy/pyempathy.defs
   trunk/src/empathy.c
Log:
Conflicts:

	ChangeLog