Merge branch 'master' into chaz

[chaz/openbox] / openbox / client_menu.h

diff --git a/openbox/client_menu.h b/openbox/client_menu.h
index 42be13966714b4c8ecce234ce8294f7a34400905..5c555168b0e021e50fd31e8b478e4d533a14f2e0 100644 (file)
--- a/openbox/client_menu.h
+++ b/openbox/client_menu.h
@@ -1,6 +1,24 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   client_menu.h for the Openbox window manager
+   Copyright (c) 2003-2007   Dana Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #ifndef ob__client_menu_h
 #define ob__client_menu_h
 
-void client_menu_startup();
+void client_menu_startup(void);
 
 #endif