Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/configs/linux-dri
	mesalib/src/gallium/auxiliary/util/u_math.h
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/glapi_mapi_tmp.h
	mesalib/src/mapi/glapi/glapi_sparc.S
	mesalib/src/mapi/glapi/glapi_x86-64.S
	mesalib/src/mapi/glapi/glapi_x86.S
	mesalib/src/mapi/glapi/glapitable.h
	mesalib/src/mapi/glapi/glapitemp.h
	mesalib/src/mapi/glapi/glprocs.h
	mesalib/src/mesa/drivers/dri/Makefile.template
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/remap_helper.h
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/state_tracker/st_format.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	xorg-server/configure.ac
	xorg-server/dix/main.c
	xorg-server/dix/window.c
	xorg-server/hw/xquartz/GL/indirect.c
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/darwin.c
	xorg-server/hw/xquartz/darwin.h
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xquartz/pbproxy/app-main.m
	xorg-server/hw/xquartz/pbproxy/pbproxy.h
	xorg-server/hw/xquartz/pbproxy/x-selection.m
	xorg-server/hw/xquartz/xpr/xpr.h
	xorg-server/hw/xquartz/xpr/xprEvent.c
	xorg-server/hw/xquartz/xpr/xprScreen.c
	xorg-server/include/privates.h
	xorg-server/include/protocol-versions.h
	xorg-server/test/Makefile.am
	xorg-server/xfixes/cursor.c
	xorg-server/xfixes/xfixes.c
	xorg-server/xkeyboard-config/configure.in
	xorg-server/xkeyboard-config/rules/base.extras.xml.in
	xorg-server/xkeyboard-config/rules/base.xml.in
	xorg-server/xkeyboard-config/symbols/de
	xorg-server/xkeyboard-config/symbols/lk
	xorg-server/xkeyboard-config/symbols/ru

2 files changed, 25 insertions, 4 deletions

diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index b2c8e40b8..64a8cc321 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -38,6 +38,27 @@
     </layout>

     <layout>

       <configItem>

+        <name>de</name>

+        <_shortDescription>de</_shortDescription>

+        <_description>German</_description>

+        <languageList>

+          <iso639Id>ger</iso639Id>

+        </languageList>

+      </configItem>

+      <variantList>

+        <variant>

+          <configItem>

+            <name>us</name>

+            <_description>German (US keyboard with German letters)</_description>

+            <languageList>

+              <iso639Id>eng</iso639Id>

+            </languageList>

+          </configItem>

+        </variant>

+      </variantList>

+    </layout>

+    <layout>

+      <configItem>

         <name>ir</name>

         <_shortDescription>fa</_shortDescription>

         <_description>Persian</_description>

@@ -241,7 +262,7 @@
           <configItem>

             <name>ruu</name>

             <_shortDescription>ru</_shortDescription>

-            <_description>Russian (with UKR and BEL layout)</_description>

+            <_description>Russian (with Ukrainian-Belorussian layout)</_description>

             <languageList><iso639Id>rus</iso639Id>

                           <iso639Id>ukr</iso639Id>

                           <iso639Id>bel</iso639Id></languageList>

diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 7bfbb17f0..7dbad7e8f 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -2132,7 +2132,7 @@
         <variant>

           <configItem>

             <name>qwerty</name>

-            <_description>English (Cameroon qwerty)</_description>

+            <_description>Cameroon Multilingual (qwerty)</_description>

             <languageList>

               <iso639Id>eng</iso639Id>

               <iso639Id>bas</iso639Id>

@@ -2169,7 +2169,7 @@
         <variant>

           <configItem>

             <name>azerty</name>

-            <_description>French (Cameroon azerty)</_description>

+            <_description>Cameroon Multilingual (azerty)</_description>

             <languageList>

               <iso639Id>fra</iso639Id>

               <iso639Id>bas</iso639Id>

@@ -4453,7 +4453,7 @@
       <configItem>

         <name>lk</name>

         <_shortDescription>si</_shortDescription>

-        <_description>Sinhala</_description>

+        <_description>Sinhala (phonetic)</_description>

         <languageList>

           <iso639Id>sin</iso639Id>

         </languageList>