From a12cf779e828ec70da714832e1eaa730119fe10c Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 30 Sep 2013 08:58:27 +0200
Subject: git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013

xkeyboard-config commit fe5c2416314fd1df423c8ce53cac2d28b00420e7
libXau           commit 304a11be4727c5a7feeb2501e8e001466f8ce84e
pixman           commit b513b3dffe979056dbbbdc8e0659f8018c51c5f5
fontconfig       commit 9161ed1e4a3f4afaee6dbcfc0b84a279ad99b397
mesa             commit 868791f0baa0b51f4255c839448d3ca87ab1aa35
---
 xorg-server/xkeyboard-config/symbols/cd | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

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

diff --git a/xorg-server/xkeyboard-config/symbols/cd b/xorg-server/xkeyboard-config/symbols/cd
index a4f2fa2d2..384422ac4 100644
--- a/xorg-server/xkeyboard-config/symbols/cd
+++ b/xorg-server/xkeyboard-config/symbols/cd
@@ -8,9 +8,8 @@ xkb_symbols "basic" {
 
     key.type[Group1] = "FOUR_LEVEL";
 
-    // Alphanumeric section
-    // TILDE, COMBINING TILDE
-    key <TLDE> { [     grave, asciitilde, 0x01000303] };
+    // GRAVE, TILDE, COMBINING TILDE
+    key <TLDE> { [     grave, asciitilde, 0x01000303                      ] };
     key <AE01> { [ ampersand,          1, numbersign                      ] };
     key <AE02> { [0x01000301,          2, at                              ] };
     key <AE03> { [0x01000300,          3, guillemotleft                   ] };
@@ -34,8 +33,8 @@ xkb_symbols "basic" {
     key <AD08> { [	   i,          I,    0x01000268,       0x01000197 ] };
     key <AD09> { [	   o,          O,        oslash,         Ooblique ] };
     key <AD10> { [	   p,          P                                  ] };
-    key <AD11> { [0x0100025B,      0x01000190,     asciicircum ] };
-    key <AD12> { [ asterisk, asciicircum, dollar                ] };
+    key <AD11> { [0x0100025B, 0x01000190,   asciicircum                   ] };
+    key <AD12> { [ asterisk, asciicircum,        dollar                   ] };
 
     key <AC01> { [	   q,          Q                                  ] };
     key <AC02> { [	   s,          S                                  ] };
@@ -47,22 +46,22 @@ xkb_symbols "basic" {
     key <AC08> { [	   k,          K                                  ] };
     key <AC09> { [	   l,          L                                  ] };
     key <AC10> { [	   m,          M                                  ] };
-    key <AC11> { [0x01000254, 0x01000186                              ] };
-    key <LSGT> { [    backslash,     bar                              ] };
+    key <AC11> { [0x01000254, 0x01000186                                  ] };
+    key <LSGT> { [    backslash,     bar                                  ] };
 
     key <AB01> { [	   w,          W                                  ] };
     key <AB02> { [	   x,          X                                  ] };
     key <AB03> { [	   c,          C                                  ] };
     key <AB04> { [	   v,          V                                  ] };
     key <AB05> { [	   b,          B                                  ] };
-    key <AB06> { [	   n,          N,    0x0100014B,      0x0100014A ] };
-    key <AB07> { [     comma,   question,      0x01000327                 ] };
+    key <AB06> { [	   n,          N,    0x0100014B,       0x0100014A ] };
+    key <AB07> { [     comma,   question,    0x01000327                   ] };
     key <AB08> { [ semicolon,     period                                  ] };
     key <AB09> { [     colon,      slash                                  ] };
-    key <AB10> { [    exclam,   apostrophe,    0x01002019                 ] };
-    key <BKSL> { [  quotedbl,  backslash,            bar                  ] };
+    key <AB10> { [    exclam,   apostrophe,  0x01002019                   ] };
+    key <BKSL> { [  quotedbl,  backslash,           bar                   ] };
 
-    // SPACE, SPACE, SPACE, NO-BREAK SPACE, SPACE
+    // SPACE, SPACE, NO-BREAK SPACE, NARROW NO_BREAK SPACE
     key <SPCE> { [ space,          space,    nobreakspace,     0x0100202F ] };
 
     include "level3(ralt_switch)"
-- 
cgit v1.2.3