Merge branch 'master' into next

[i3/i3] / include / data.h

diff --git a/include/data.h b/include/data.h
index 810709cdc28d4fe62275eae5ed1a94de71277b99..9a814f4517edb63d5ccc10694773070ddad69c35 100644 (file)
--- 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>
@@ -135,6 +134,7 @@ struct deco_render_params {
     Rect con_deco_rect;
     uint32_t background;
     bool con_is_leaf;
+    orientation_t parent_orientation;
 };
 
 /**
@@ -196,7 +196,8 @@ struct regex {
 
 /**
  * Holds a keybinding, consisting of a keycode combined with modifiers and the
- * command which is executed as soon as the key is pressed (see src/cfgparse.y)
+ * command which is executed as soon as the key is pressed (see
+ * src/config_parser.c)
  *
  */
 struct Binding {