Merge branch 'master' into next

2012-12-14 21:50:15 +01:00 · 2012-12-14 21:50:15 +01:00 · 73ec3dd3b0
parent 4273db0444 6dc25e0011
commit 73ec3dd3b0
3 changed files with 0 additions and 3 deletions
--- 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
--- 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>
--- 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>