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

diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs
index c39f4ed49..e164f2eee 100644
--- a/xorg-server/xkeyboard-config/symbols/rs
+++ b/xorg-server/xkeyboard-config/symbols/rs
@@ -45,7 +45,7 @@ xkb_symbols "yz" {
     key <AB01> { [ Cyrillic_ze,     Cyrillic_ZE,   any, any ] }; // z
 };
 
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "common" {
     // "Common" keys: keys that are the same
     // for both latin and cyrillic keyboards.
@@ -73,7 +73,7 @@ xkb_symbols "common" {
     include "kpdl(comma)"
 };
 
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "cyralpha" {
 
     key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
@@ -114,7 +114,7 @@ xkb_symbols "cyralpha" {
 };
 
 
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "latalpha" {
 
     key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
@@ -127,7 +127,7 @@ xkb_symbols "latalpha" {
     key <BKSL> { [ zcaron,         Zcaron,         any, any ] }; // \ |
 };
 
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "twoletter" {
 
     // Letters which are written in latin transcription with two characters.
@@ -142,7 +142,7 @@ xkb_symbols "twoletter" {
     key <AB01> { [ zcaron,         Zcaron,        any, any ] }; // z
 };
 
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "latlevel3" {
     key <TLDE> { [ any, any,   notsign,             notsign          ] }; // ` ~
     key <AE01> { [ any, any,   dead_tilde,          asciitilde       ] }; // 1 !
@@ -196,7 +196,7 @@ xkb_symbols "latlevel3" {
     key <AB10> { [ any, any,   emdash,              endash           ] }; // / ?
 };
 
-partial hidden alphanumeric_keys
+hidden partial alphanumeric_keys
 xkb_symbols "cyrlevel3" {
     key <TLDE> { [ any, any,   degree,              notsign          ] }; // ` ~
     key <AE03> { [ any, any,   dead_circumflex,     NoSymbol         ] }; // 3 #