brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gnome-2-26' into master

Browse Source 
Conflicts:
	configure.in
	src/core/schema-bindings.c
This commit is contained in:
Owen W. Taylor
2009-04-08 16:11:12 -04:00
parent 058c884f1f 82706fd958
commit 626912a9a4
56 changed files with 67624 additions and 83079 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/all-keybindings.h
View File

@ -188,7 +188,7 @@ keybind (cycle_panels_backward, handle_cycle, META_TAB_LIST_DOCKS,
/***********************************/
keybind (show_desktop, handle_show_desktop, 0, 0, "<Control><Alt>d",
_("Hide all normal windows and set focus to the desktop background"))
_("Hide all normal windows and set focus to the desktop"))
keybind (panel_main_menu, handle_panel,
META_KEYBINDING_ACTION_PANEL_MAIN_MENU, 0, "<Alt>F1",
_("Show the panel's main menu"))