Merge branch 'master' into chaz

[chaz/openbox] / openbox / client_list_combined_menu.h

diff --git a/openbox/client_list_combined_menu.h b/openbox/client_list_combined_menu.h
index d48ee09bca4263b59c183fef72b600f543c246c9..420e898e82ca36cf794415231ba539ee82bbeb13 100644 (file)
--- a/openbox/client_list_combined_menu.h
+++ b/openbox/client_list_combined_menu.h
@@ -2,7 +2,7 @@
 
    client_list_menu.h for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   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
@@ -20,7 +20,7 @@
 #ifndef ob__client_list_combined_menu_h
 #define ob__client_list_combined_menu_h
 
-void client_list_menu_combined_startup(gboolean reconfig);
-void client_list_menu_combined_shutdown(gboolean reconfig);
+void client_list_combined_menu_startup(gboolean reconfig);
+void client_list_combined_menu_shutdown(gboolean reconfig);
 
 #endif