From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 3 May 2013 12:19:23 +0000 (+0200)
Subject: Merge branch 'gnome-3-8'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed

Merge branch 'gnome-3-8'

Conflicts:
	src/empathy.c
---

c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed
diff --cc libempathy/empathy-utils.c
index 55769ca4,b8f54baa..0efe3a18
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@@ -27,16 -27,20 +27,18 @@@
   */
  
  #include "config.h"
 +#include "empathy-utils.h"
  
  #include <glib/gi18n-lib.h>
 -
 -#include <libxml/uri.h>
  #include <dbus/dbus-protocol.h>
 +#include <math.h>
  
  #include "empathy-client-factory.h"
 -#include "empathy-utils.h"
  #include "empathy-presence-manager.h"
 -
 -#include <extensions/extensions.h>
 +#include "extensions.h"
  
+ #include <math.h>
+ 
  #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
  #include "empathy-debug.h"