Merge branch 'master' into next

[i3/i3] / include / con.h

diff --git a/include/con.h b/include/con.h
index 62eb12d0d7584255c5a93aff2000fa07b4debffb..7c60211515f9ffe878fc0a6a3d6568ac7abb4675 100644 (file)
--- a/include/con.h
+++ b/include/con.h
@@ -14,8 +14,13 @@
 
 /**
  * Create a new container (and attach it to the given parent, if not NULL).
- * This function initializes the data structures and creates the appropriate
- * X11 IDs using x_con_init().
+ * This function only initializes the data structures.
+ *
+ */
+Con *con_new_skeleton(Con *parent, i3Window *window);
+
+
+/* A wrapper for con_new_skeleton, to retain the old con_new behaviour
  *
  */
 Con *con_new(Con *parent, i3Window *window);