]> git.0d.be Git - empathy.git/commit
Conflicts:
authorXavier Claessens <xclaesse@src.gnome.org>
Sun, 2 Dec 2007 22:38:02 +0000 (22:38 +0000)
committerXavier Claessens <xclaesse@src.gnome.org>
Sun, 2 Dec 2007 22:38:02 +0000 (22:38 +0000)
commit7bf5562a19ecac3c59dc23ebe507112e2745b635
tree9fccd6613f968d0fc40b518399d7858cb3c609fe
parentd54baf1615b3d019878f7dac66303de77737a6f0
Conflicts:

ChangeLog

svn path=/trunk/; revision=455
23 files changed:
ChangeLog
configure.ac
libempathy-gtk/empathy-account-chooser.c
libempathy-gtk/empathy-accounts-dialog.c
libempathy-gtk/empathy-chat.c
libempathy-gtk/empathy-contact-dialogs.c
libempathy-gtk/empathy-group-chat.c
libempathy-gtk/empathy-main-window.c
libempathy-gtk/empathy-presence-chooser.c
libempathy-gtk/empathy-status-presets.c
libempathy/empathy-avatar.c
libempathy/empathy-contact-factory.c
libempathy/empathy-contact-manager.c
libempathy/empathy-tp-call.c
libempathy/empathy-tp-chat.c
libempathy/empathy-tp-chat.h
libempathy/empathy-tp-contact-list.c
libempathy/empathy-tp-group.c
libempathy/empathy-tp-roomlist.c
libempathy/empathy-utils.c
libempathy/empathy-utils.h
python/pyempathy/pyempathy.defs
src/empathy.c