Merge branch 'master' into next

[i3/i3] / include / manage.h

diff --git a/include/manage.h b/include/manage.h
index e23eccf36a9960f19712061e4471911754ff9f7b..c16d295f6c3eabd53b0604a2fd1c81a39c80962a 100644 (file)
--- a/include/manage.h
+++ b/include/manage.h
@@ -1,19 +1,17 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * manage.c: Initially managing new windows (or existing ones on restart).
  *
  */
-
-#include "data.h"
-
 #ifndef _MANAGE_H
 #define _MANAGE_H
 
+#include "data.h"
+
 /**
  * Go through all existing windows (if the window manager is restarted) and
  * manage them
@@ -29,7 +27,7 @@ void manage_existing_windows(xcb_window_t root);
  * side-effects which are to be expected when continuing to run i3.
  *
  */
-void restore_geometry();
+void restore_geometry(void);
 
 /**
  * Do some sanity checks and then reparent the window.