From e53b7431a34c09ceed319a1680cde1e44a50dab2 Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip.withnall@collabora.co.uk>
Date: Wed, 23 Jun 2010 16:46:26 +0100
Subject: Fixes from merging master

---
 src/empathy-main-window.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

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>
 
-- 
cgit v1.2.3