diff options
author | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-06-23 23:46:26 +0800 |
---|---|---|
committer | Travis Reitter <treitter@gmail.com> | 2010-07-21 07:12:35 +0800 |
commit | e53b7431a34c09ceed319a1680cde1e44a50dab2 (patch) | |
tree | 0bad458e16a414b17d648a1e84b6888823c1e06f | |
parent | 6bf4569e50d1df275281b790adcae934b8a53ce7 (diff) | |
download | gsoc2013-empathy-e53b7431a34c09ceed319a1680cde1e44a50dab2.tar gsoc2013-empathy-e53b7431a34c09ceed319a1680cde1e44a50dab2.tar.gz gsoc2013-empathy-e53b7431a34c09ceed319a1680cde1e44a50dab2.tar.bz2 gsoc2013-empathy-e53b7431a34c09ceed319a1680cde1e44a50dab2.tar.lz gsoc2013-empathy-e53b7431a34c09ceed319a1680cde1e44a50dab2.tar.xz gsoc2013-empathy-e53b7431a34c09ceed319a1680cde1e44a50dab2.tar.zst gsoc2013-empathy-e53b7431a34c09ceed319a1680cde1e44a50dab2.zip |
Fixes from merging master
-rw-r--r-- | src/empathy-main-window.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 0e596fe0a..0af2413fc 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -42,6 +42,7 @@ #include <libempathy/empathy-contact-manager.h> #include <libempathy/empathy-gsettings.h> #include <libempathy/empathy-individual-manager.h> +#include <libempathy/empathy-gsettings.h> #include <libempathy/empathy-status-presets.h> #include <libempathy/empathy-tp-contact-factory.h> |