Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/mesa/main/macros.h
	xorg-server/dix/registry.c
	xorg-server/hw/kdrive/ephyr/ephyrinit.c
	xorg-server/hw/xwin/Makefile.am
	xorg-server/hw/xwin/glx/.gitignore
	xorg-server/hw/xwin/glx/gen_gl_wrappers.py
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/windisplay.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winprefs.c

1 files changed, 12 insertions, 12 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/capslock b/xorg-server/xkeyboard-config/symbols/capslock
index 928d79a3e..3f4a0cd70 100644
--- a/xorg-server/xkeyboard-config/symbols/capslock
+++ b/xorg-server/xkeyboard-config/symbols/capslock
@@ -1,27 +1,27 @@
-default  partial hidden modifier_keys
+default  hidden partial modifier_keys
 xkb_symbols "capslock" {
     replace key <CAPS> { [ Caps_Lock ] };
     modifier_map Lock { Caps_Lock };
 };
 
-partial hidden modifier_keys
+hidden partial modifier_keys
 xkb_symbols "shiftlock" {
     replace key <CAPS> { [ Shift_Lock ] };
     modifier_map Shift { Shift_Lock };
 };
 
-partial hidden modifier_keys
+hidden partial modifier_keys
 xkb_symbols "grouplock" {
     replace key <CAPS> { [ ISO_Next_Group, Caps_Lock ] };
 };
 
-partial hidden modifier_keys
+hidden partial modifier_keys
 xkb_symbols "swapescape" {
     key <CAPS> { [ Escape ] };
     key <ESC>  { [ Caps_Lock ] };
 };
 
-partial hidden modifier_keys
+hidden partial modifier_keys
 xkb_symbols "groupshift" {
     key <CAPS> {
         type[Group1] = "PC_ALT_LEVEL2",
@@ -29,41 +29,41 @@ xkb_symbols "groupshift" {
     };
 };
 
-partial hidden modifier_keys
+hidden partial modifier_keys
 xkb_symbols "escape" {
     key <CAPS> { [ Escape ] };
 };
 
-partial hidden modifier_keys
+hidden partial modifier_keys
 xkb_symbols "backspace" {
     key <CAPS> { [ BackSpace ] };
 };
 
-partial hidden modifier_keys
+hidden partial modifier_keys
 xkb_symbols "super" {
     key <CAPS> { [ Super_L ] };
     modifier_map Mod4 { <CAPS> };
 };
 
-partial hidden modifier_keys
+hidden partial modifier_keys
 xkb_symbols "hyper" {
     key <CAPS> { [ Hyper_L ] };
     modifier_map Mod4 { <CAPS> };
 };
 
-partial hidden modifier_keys
+hidden partial modifier_keys
 xkb_symbols "none" {
     key <CAPS> { [ VoidSymbol ] };
 };
 
-partial hidden modifier_keys
+hidden partial modifier_keys
 xkb_symbols "numlock" {
     key <CAPS> { [ Num_Lock ] };
 };
 
 // This changes the <CAPS> key to become a Control modifier,
 // but it will still produce the Caps_Lock keysym.
-partial hidden modifier_keys
+hidden partial modifier_keys
 xkb_symbols "ctrl_modifier" {
     replace key <CAPS> {
         type[Group1] = "ONE_LEVEL",