Merge branch 'master' into chaz

[chaz/openbox] / openbox / client_menu.h

diff --git a/openbox/client_menu.h b/openbox/client_menu.h
index defc8bd11eb7299b324a3ceb9b45a6d28bc0cdfd..5c555168b0e021e50fd31e8b478e4d533a14f2e0 100644 (file)
--- a/openbox/client_menu.h
+++ b/openbox/client_menu.h
@@ -1,7 +1,7 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    client_menu.h for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   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
@@ -19,6 +19,6 @@
 #ifndef ob__client_menu_h
 #define ob__client_menu_h
 
-void client_menu_startup();
+void client_menu_startup(void);
 
 #endif