From eca5dee9e7a8dea1edba4d10b60444ac0e884139 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 20 Mar 2011 16:32:44 +0000
Subject: xserver libX11 libxcb pixman mesa git update 20 Mar 2011

---
 xorg-server/xkeyboard-config/symbols/cd   | 18 +++++++++---------
 xorg-server/xkeyboard-config/symbols/inet |  5 +++++
 2 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'xorg-server/xkeyboard-config/symbols')

diff --git a/xorg-server/xkeyboard-config/symbols/cd b/xorg-server/xkeyboard-config/symbols/cd
index 8a12a384e..5cc09a154 100644
--- a/xorg-server/xkeyboard-config/symbols/cd
+++ b/xorg-server/xkeyboard-config/symbols/cd
@@ -19,14 +19,14 @@ xkb_symbols "basic" {
     key <AE06> { [ braceright,         6, greater                         ] };
     key <AE07> { [parenright,          7, bracketright                    ] };
     key <AE08> { [0x01000302,          8, guillemotright                  ] };
-    key <AE09> { [0x0100030c,          9                                  ] };
+    key <AE09> { [0x0100030c,          9, 0x0100030D                      ] };
     key <AE10> { [0x01000308,          0, at                              ] };
-    key <AE11> { [     minus,      underscore,   percent                  ] };
+    key <AE11> { [     minus,      underscore,  percent,          degree  ] };
     key <AE12> { [     equal,      plus,       multiply,        division  ] };
 
-    key <AD01> { [         a,          A                                  ] };
+    key <AD01> { [         a,          A,            ae,              AE  ] };
     key <AD02> { [	   z,          Z                                  ] };
-    key <AD03> { [	   e,          E                                  ] };
+    key <AD03> { [	   e,          E,            oe,              OE  ] };
     key <AD04> { [         r,          R                                  ] };
     key <AD05> { [	   t,          T                                  ] };
     key <AD06> { [	   y,          Y                                  ] };
@@ -56,14 +56,14 @@ xkb_symbols "basic" {
     key <AB04> { [	   v,          V                                  ] };
     key <AB05> { [	   b,          B                                  ] };
     key <AB06> { [	   n,          N                                  ] };
-    key <AB07> { [     comma,   question,        0x01000327               ] };
-    key <AB08> { [ semicolon,     period                              ] };
-    key <AB09> { [     colon,      slash                              ] };
-    key <AB10> { [    exclam,   apostrophe,     0x01002019           ] };
+    key <AB07> { [     comma,   question,      0x01000327                 ] };
+    key <AB08> { [ semicolon,     period                                  ] };
+    key <AB09> { [     colon,      slash                                  ] };
+    key <AB10> { [    exclam,   apostrophe,    0x01002019                 ] };
     key <BKSL> { [  quotedbl,  backslash,            bar                  ] };
 
     // SPACE, SPACE, SPACE, NO-BREAK SPACE, SPACE
-    key <SPCE> { [ space,          space,  nobreakspace,     nobreakspace ] };
+    key <SPCE> { [ space,          space,    nobreakspace,     0x0100202F ] };
 
     include "level3(ralt_switch)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/inet b/xorg-server/xkeyboard-config/symbols/inet
index 5fbc8a7a7..c3366b1d8 100644
--- a/xorg-server/xkeyboard-config/symbols/inet
+++ b/xorg-server/xkeyboard-config/symbols/inet
@@ -167,6 +167,11 @@ xkb_symbols "evdev" {
     key <I188>   {      [ parenright            ]       };
     key <I189>   {      [ XF86New               ]       };
     key <I190>   {      [ Redo                  ]       };
+    key <I192>   {      [ XF86LaunchA           ]       };
+    key <I193>   {      [ XF86LaunchC           ]       };
+    key <I194>   {      [ XF86LaunchD           ]       };
+    key <I195>   {      [ XF86LaunchE           ]       };
+    key <I196>   {      [ XF86LaunchF           ]       };
     key <I208>   {      [ XF86AudioPlay         ]       };
     key <I209>   {      [ XF86AudioPause        ]       };
     key <I210>   {      [ XF86Launch3           ]       };
-- 
cgit v1.2.3