Merge back from master
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>
Fri, 21 Aug 2009 16:37:48 +0000 (17:37 +0100)
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>
Fri, 21 Aug 2009 16:37:48 +0000 (17:37 +0100)
commit84e30dab1428affe335ef904377d07f8b5fdeb66
treefee9c8ec124a2b5804f6bb4ee31772db56a6e374
parentfd8e9c5dc2584055177c7a79021cdd53ca431c22
parent3803736b4326d4bc00d58ccd25f910907f0b4521
Merge back from master
21 files changed:
configure.ac
data/Makefile.am
libempathy-gtk/empathy-chat.c
libempathy-gtk/empathy-contact-list-view.c
libempathy-gtk/empathy-share-my-desktop.c
libempathy-gtk/empathy-theme-adium.c
libempathy-gtk/empathy-ui-utils.c
libempathy-gtk/empathy-ui-utils.h
libempathy/Makefile.am
libempathy/empathy-call-handler.c
libempathy/empathy-idle.c
libempathy/empathy-idle.h
libempathy/empathy-tp-chat.c
libempathy/empathy-tp-contact-factory.c
libempathy/empathy-tp-contact-list.c
po/POTFILES.in
python/pyempathy/pyempathy.defs
python/pyempathygtk/pyempathygtk.defs
src/empathy-chat-window.c
src/empathy-status-icon.c
src/empathy.c