Merge branch 'master' into next

[i3/i3] / include / load_layout.h

diff --git a/include/load_layout.h b/include/load_layout.h
index f3a60a097a8cdf4dd0a99bbf4d41c286633bb856..0a5328fafc31f601b12a2d032b089bcf96979ea0 100644 (file)
--- a/include/load_layout.h
+++ b/include/load_layout.h
@@ -1,6 +1,13 @@
-#ifndef _LOAD_LAYOUT_H
-#define _LOAD_LAYOUT_H
+/*
+ * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * load_layout.c: Restore (parts of) the layout, for example after an inplace
+ *                restart.
+ *
+ */
+#pragma once
 
-void tree_append_json(const char *filename);
-
-#endif
+void tree_append_json(const char *filename, char **errormsg);