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

1 files changed, 20 insertions, 0 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index d87140f45..170abb183 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -594,3 +594,23 @@ xkb_symbols "htcdream" {
 

         include "level3(alt_switch)"

 };

+

+partial alphanumeric_keys

+xkb_symbols "us" {

+    include "us"

+

+    name[Group1]="German (US keyboard with German letters)";

+

+    key <AC01> { [           a,          A, adiaeresis, Adiaeresis ] };

+    key <AC02> { [           s,          S,     ssharp,     ssharp ] };

+    key <AC10> { [   semicolon,      colon, odiaeresis, Odiaeresis ] };

+    key <AC11> { [  apostrophe,   quotedbl, adiaeresis, Adiaeresis ] };

+    key <AD03> { [           e,          E,   EuroSign,   EuroSign ] };

+    key <AD07> { [           u,          U, udiaeresis, Udiaeresis ] };

+    key <AD09> { [           o,          O, odiaeresis, Odiaeresis ] };

+    key <AD11> { [ bracketleft,  braceleft, udiaeresis, Udiaeresis ] };

+    key <AE03> { [           3, numbersign,    section,    section ] };

+    key <AE11> { [       minus, underscore,     ssharp,   question ] };

+

+    include "level3(ralt_switch)"

+};