From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 14 Dec 2012 20:50:15 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.5~109
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=73ec3dd3b07e8de90e7c0a5ccba9a5c3d2908efa;hp=4273db04445046499f6e259678665b917498d29b

Merge branch 'master' into next
---

diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
index 6bd8039b..3a8d8b9c 100644
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@ -9,7 +9,6 @@
  */
 #include <xcb/xcb.h>
 #include <xcb/xproto.h>
-#include <xcb/xcb_atom.h>
 #include <xcb/xcb_aux.h>
 
 #ifdef XCB_COMPAT
diff --git a/include/data.h b/include/data.h
index 63b18b28..70b65011 100644
--- a/include/data.h
+++ b/include/data.h
@@ -14,7 +14,6 @@
 #include <libsn/sn-launcher.h>
 
 #include <xcb/randr.h>
-#include <xcb/xcb_atom.h>
 #include <stdbool.h>
 #include <pcre.h>
 #include <sys/time.h>
diff --git a/src/click.c b/src/click.c
index 5eedd000..c48132ee 100644
--- a/src/click.c
+++ b/src/click.c
@@ -14,7 +14,6 @@
 #include <time.h>
 #include <math.h>
 
-#include <xcb/xcb_atom.h>
 #include <xcb/xcb_icccm.h>
 
 #include <X11/XKBlib.h>