commit 0b44641cdd6fec4abe8c8ee96d6bdbe84db944da Author: Guillaume Desmottes Date: Fri Dec 24 11:57:03 2010 +0100 prepare 2.91.4.3 NEWS | 16 ++++++++++++++++ configure.ac | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) commit 23cabd47964ba2d692018dbf8f8b2e87f208254b Author: Guillaume Desmottes Date: Fri Dec 24 11:51:24 2010 +0100 Depends on gcr 2.91.4 We need it as we don't ship our own version of gcr-simple-certificate any more. I'm not sure we still need depending on gnome-keyring itself, I'll check with Stef; but for now I just want to make a release usable by the release team. configure.ac | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 8f4bd49edcf38951072b9f12ce50ba9aaddac83d Author: Guillaume Desmottes Date: Fri Dec 24 11:42:57 2010 +0100 just include gcr.h libempathy-gtk/empathy-tls-dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 89ed5197c3cf61971b8425b176ce71073add7360 Author: Stef Walter Date: Thu Dec 2 17:21:38 2010 +0000 libempathy-gtk: No need to 'egg' gcr-simple-certificate.[ch] These are now properly distributed by libgcr. libempathy-gtk/Makefile.am | 1 - libempathy-gtk/empathy-tls-dialog.c | 2 +- libempathy-gtk/gcr-simple-certificate.c | 134 ------------------------------- libempathy-gtk/gcr-simple-certificate.h | 61 -------------- 4 files changed, 1 insertions(+), 197 deletions(-) commit dfc08c3feee35e194fdb58441752ea82f79c166a Merge: b55050d 083af6c Author: Danielle Madeley Date: Fri Dec 24 17:04:05 2010 +1100 Merge remote branch 'glassrose/enable-disable-accounts-popup-609568' commit 083af6c8057407a6b7895020339d19a3eb7257c7 Author: Chandni Verma Date: Sat Dec 18 01:52:12 2010 +0530 Popup menu feature to quickly enable/disable an account. Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=609568 src/empathy-accounts-dialog.c | 95 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) commit b55050dbfb73d4f724d5b04fd4ddeff21e4f7685 Author: Gheyret T.Kenji Date: Thu Dec 23 18:32:01 2010 +0100 Added UG translation po/ug.po | 831 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 439 insertions(+), 392 deletions(-) commit 6d801f75006f2cf60c17f0f3abd0f3ba26638702 Author: Guillaume Desmottes Date: Thu Dec 23 16:12:09 2010 +0100 remove released flag configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)