From: Axel Wagner <mail@merovius.de>
Date: Thu, 23 Dec 2010 15:34:19 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Tag: 4.0.1~7^2~36^2~2
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=94a8273b09de5b7b06c4b79eb7a41b934a43bc32

Merge branch 'next'
---

94a8273b09de5b7b06c4b79eb7a41b934a43bc32
diff --cc i3bar/src/xcb.c
index 7f6379e1,326ca2ad..300ac859
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@@ -327,10 -634,8 +634,10 @@@ void destroy_window(i3_output *output) 
   */
  void reconfig_windows() {
      uint32_t mask;
-     uint32_t values[4];
+     uint32_t values[5];
  
 +    xcb_generic_error_t *err;
 +
      i3_output *walk;
      SLIST_FOREACH(walk, outputs, slist) {
          if (!walk->active) {