Merge branch 'master' into next

[i3/i3] / i3bar / include / trayclients.h

diff --git a/i3bar/include/trayclients.h b/i3bar/include/trayclients.h
index 1113daebfdcb1403a9e0d43985d74c9607127d84..7a7e537e0027514cc07fc3fdd42e6ba4f3a288a9 100644 (file)
--- a/i3bar/include/trayclients.h
+++ b/i3bar/include/trayclients.h
@@ -1,13 +1,11 @@
 /*
- * i3bar - an xcb-based status- and ws-bar for i3
- *
- * © 2010-2011 Axel Wagner and contributors
+ * vim:ts=4:sw=4:expandtab
  *
- * See file LICNSE for license information
+ * i3bar - an xcb-based status- and ws-bar for i3
+ * © 2010-2011 Axel Wagner and contributors (see also: LICENSE)
  *
  */
-#ifndef TRAYCLIENT_H_
-#define TRAYCLIENT_H_
+#pragma once
 
 #include "common.h"
 
@@ -22,5 +20,3 @@ struct trayclient {
 
     TAILQ_ENTRY(trayclient) tailq;  /* Pointer for the TAILQ-Macro */
 };
-
-#endif