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, 9 insertions, 9 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/inet b/xorg-server/xkeyboard-config/symbols/inet
index 613488f05..33b058397 100644
--- a/xorg-server/xkeyboard-config/symbols/inet
+++ b/xorg-server/xkeyboard-config/symbols/inet
@@ -14,7 +14,7 @@
 // setxkbmap 'my_kb_layout' -variant 'my_kb_variant' -model 'my_eak_type'
 
 // Very common set of media keys.
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "media_common" {
     key <I01>   {       [ XF86AudioMedia        ] };
     key <I10>   {       [ XF86AudioPrev         ] };
@@ -29,7 +29,7 @@ xkb_symbols "media_common" {
 };
 
 // Popular web navigation keys.
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "nav_common" {
     key <I21>   {       [ XF86Calculator        ] };
     key <I32>   {       [ XF86WWW               ] };
@@ -45,7 +45,7 @@ xkb_symbols "nav_common" {
 };
 
 // ACPI Standard
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "acpi_common" {
     key <I5E>	{	[ XF86PowerOff		]	};
     key <I5F>	{	[ XF86Standby		]	};
@@ -56,26 +56,26 @@ xkb_symbols "acpi_common" {
 };
 
 // Combined sections, for simplicity.
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "media_nav_common" {
     include "inet(media_common)"
     include "inet(nav_common)"
 };
 
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "media_nav_acpi_common" {
     include "inet(media_common)"
     include "inet(nav_common)"
     include "inet(acpi_common)"
 };
 
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "nav_acpi_common" {
     include "inet(nav_common)"
     include "inet(acpi_common)"
 };
 
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "media_acpi_common" {
     include "inet(media_common)"
     include "inet(acpi_common)"
@@ -1001,7 +1001,7 @@ xkb_symbols "ibm_spacesaver" {
 // Logitech
 
 // Logitech common definitions
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "logitech_base" {
     include "inet(media_nav_acpi_common)"
     key <I02> { [ XF86HomePage ] };
@@ -1017,7 +1017,7 @@ xkb_symbols "logitech_base" {
 };
 
 // Logitech second set of common keys
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "logitech_set3" {
     key <I17>	{	[ XF86AudioStop		]	};
     key <I1E>	{	[ XF86AudioRaiseVolume	]	};