Merge branch 'master' into next

[i3/i3] / include / output.h

diff --git a/include/output.h b/include/output.h
index 67652fa102964aa713230ca2f3856b1354be76b5..e87da22e063b1314bffebb349b6764a079006013 100644 (file)
--- a/include/output.h
+++ b/include/output.h
@@ -1,9 +1,14 @@
 /*
  * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * output.c: Output (monitor) related functions.
+ *
  */
-
-#ifndef _OUTPUT_H
-#define _OUTPUT_H
+#ifndef I3_OUTPUT_H
+#define I3_OUTPUT_H
 
 /**
  * Returns the output container below the given output container.