Merge remote-tracking branch 'origin/released'

Conflicts:
	X11/extensions/configure.ac
	X11/xtrans/configure.ac
	X11/xtrans/doc/Makefile.am
	libX11/configure.ac
	libX11/docbook.am
	libXdmcp/configure.ac
	libXdmcp/doc/Makefile.am
	libXext/configure.ac
	libXext/docbook.am
	libXmu/configure.ac
	libXmu/doc/Makefile.am
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/glapi.h
	mesalib/src/mesa/state_tracker/st_draw.c
	xorg-server/xkeyboard-config/rules/base.extras.xml.in
	xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
	xorg-server/xkeyboard-config/symbols/de

1 files changed, 27 insertions, 0 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index b3da23a2a..4b33becf1 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -580,6 +580,8 @@ xkb_symbols "htcdream" {
         include "level3(alt_switch)"

 };

 

+// EXTRAS:

+

 partial alphanumeric_keys

 xkb_symbols "us" {

     include "us"

@@ -599,3 +601,28 @@ xkb_symbols "us" {
 

     include "level3(ralt_switch)"

 };

+

+partial alphanumeric_keys

+xkb_symbols "hu" {

+

+    // modify the basic German layout to not have any dead keys and add Hungarian letters

+

+    include "de(basic)"

+    name[Group1]="German (with Hungarian letters and no dead keys)";

+

+    key <AB01> { [         y,          Y, guillemotleft,        less ] };

+    key <AC10> { [odiaeresis, Odiaeresis,        eacute,      Eacute ] };

+    key <AC11> { [adiaeresis, Adiaeresis,        aacute,       Aacute] };

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

+    key <AD06> { [         z,          Z,     leftarrow,         yen ] };

+    key <AD07> { [         u,          U,        uacute,      Uacute ] };

+    key <AD08> { [         i,          I,        iacute,      Iacute ] };

+    key <AD09> { [         o,          O,  odoubleacute,Odoubleacute ] };

+    key <AD11> { [udiaeresis, Udiaeresis,  udoubleacute,Udoubleacute ] };

+    key <AD12> { [      plus,   asterisk,    asciitilde,      macron ] };

+    key <AE12> { [     acute,      grave,        oacute,      Oacute ] };

+    key <BKSL> { [numbersign, apostrophe,         grave,       grave ] };

+    key <TLDE> { [asciicircum,    degree,       notsign,     notsign ] };

+    

+    

+};