From 5df6fc0b0a8a4d94cb7148f9598b9d4c3094efc6 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Wed, 18 Apr 2007 12:03:48 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

---
diff --git a/browser/GeckoBrowserPersist.cpp b/browser/GeckoBrowserPersist.cpp
index 5e698d8..2c019c5 100644
--- a/browser/GeckoBrowserPersist.cpp
+++ b/browser/GeckoBrowserPersist.cpp
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #ifdef HAVE_GECKO_1_9
 
 #include <stdio.h>
@@ -16,7 +18,6 @@
 #include <nsIInputStream.h>
 #include <nsIWebNavigation.h>
 
-#include <config.h>
 #include "GeckoBrowserPersist.h"
 
 GeckoBrowserPersist::GeckoBrowserPersist(SugarBrowser *browser)
diff --git a/browser/GeckoDocumentObject.cpp b/browser/GeckoDocumentObject.cpp
index fcbbe69..fe4a824 100644
--- a/browser/GeckoDocumentObject.cpp
+++ b/browser/GeckoDocumentObject.cpp
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #ifdef HAVE_GECKO_1_9
 
 #include <unistd.h>
@@ -18,7 +20,6 @@
 #include <nsServiceManagerUtils.h>
 #include <nsStringAPI.h>
 
-#include <config.h>
 #include "GeckoDocumentObject.h"
 #include "GeckoBrowserPersist.h"
                     
diff --git a/browser/GeckoDragDropHooks.cpp b/browser/GeckoDragDropHooks.cpp
index fdca954..d8b0a84 100644
--- a/browser/GeckoDragDropHooks.cpp
+++ b/browser/GeckoDragDropHooks.cpp
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #ifdef HAVE_GECKO_1_9
 
 #include <sys/time.h>
@@ -14,7 +16,6 @@
 #include <nsIInterfaceRequestorUtils.h>
 #include <nsIDOMMouseEvent.h>
 
-#include <config.h>
 #include "GeckoDragDropHooks.h"
 #include "GeckoDocumentObject.h"
 
--
cgit v0.9.1