diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-05-11 18:03:18 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-05-11 18:03:18 +0800 |
| commit | 36d503aaffffde7c795f62b77dbad61f48c55f23 (patch) | |
| tree | 2fc5601d18e8926d8973ef6fda3120283aa4747b /libempathy-gtk/empathy-theme-adium.c | |
| parent | 2ef5340f19483a5845976332706886d60eea38dd (diff) | |
| parent | f4e2fc16b56fb94b896014692e5bf0eba402ffe3 (diff) | |
| download | gsoc2013-empathy-36d503aaffffde7c795f62b77dbad61f48c55f23.tar gsoc2013-empathy-36d503aaffffde7c795f62b77dbad61f48c55f23.tar.gz gsoc2013-empathy-36d503aaffffde7c795f62b77dbad61f48c55f23.tar.bz2 gsoc2013-empathy-36d503aaffffde7c795f62b77dbad61f48c55f23.tar.lz gsoc2013-empathy-36d503aaffffde7c795f62b77dbad61f48c55f23.tar.xz gsoc2013-empathy-36d503aaffffde7c795f62b77dbad61f48c55f23.tar.zst gsoc2013-empathy-36d503aaffffde7c795f62b77dbad61f48c55f23.zip | |
Merge remote-tracking branch 'public-upstream/gnome-2-34' into empathy-skype
Conflicts:
libempathy/empathy-contact.c
Diffstat (limited to 'libempathy-gtk/empathy-theme-adium.c')
| -rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index 2569e7faf..88672554f 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -22,7 +22,7 @@ #include "config.h" #include <string.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <webkit/webkit.h> #include <telepathy-glib/dbus.h> |