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
---
 .../xkeyboard-config/symbols/macintosh_vndr/dk     | 30 ++++++++++------------
 1 file changed, 14 insertions(+), 16 deletions(-)

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

diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
index 11e38598c..e464519e0 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
@@ -21,26 +21,24 @@ xkb_symbols "basic" {
     key <AE08> {	[        8,       parenleft,      bracketleft,   guillemotleft	]};
     key <AE09> {	[        9,      parenright,     bracketright,  guillemotright	]};
     key <AE10> {	[        0,           equal,       braceright,          degree	]};
+    key <AE11> {	[     plus,        question,        plusminus,    questiondown	]};
+    key <AE12> {   	[ dead_acute,    dead_grave,              bar,       brokenbar	]};
+    key <AB03> {	[        c,               C,        copyright,        NoSymbol	]};
     key <AB08> {	[    comma,       semicolon,     dead_cedilla,     dead_ogonek	]};
     key <AB09> {	[   period,           colon,   periodcentered,   dead_abovedot	]};
-    key <AB03> {	[        c,               C,        copyright,        NoSymbol	]};
     key <AB10> {	[    minus,      underscore,           hyphen,          macron	]};
-    key <AC01> {        [        a,               A,      ordfeminine,       masculine      ]};
-    key <AC03> {        [        d,               D,              eth,             ETH      ]};
-    key <AD03> {        [        e,               E,         EuroSign,            cent      ]};
-    key <AD04> {        [        r,               R,       registered,        NoSymbol      ]};
-    key <AD05> {        [        t,               T,            thorn,           THORN      ]};
-    key <AD08> {        [        i,               I,         NoSymbol,        NoSymbol      ]};
-    key <AD09> {        [        o,               O,               oe,              OE      ]};
-    key	<AC10> {	[	ae,               AE	]};
-    key <AE11> {	[     plus,        question,        plusminus,    questiondown	]};
+    key <AC01> {	[        a,               A,      ordfeminine,       masculine  ]};
+    key <AC03> {	[        d,               D,              eth,             ETH  ]};
+    key <AC10> {	[	ae,               AE	]};
     key <AC11> {	[   oslash,        Ooblique 	]};
-    key <BKSL> {	[ apostrophe,        asterisk, dead_doubleacute,        multiply	]};
+    key <AD03> {	[        e,               E,         EuroSign,            cent  ]};
+    key <AD04> {	[        r,               R,       registered,        NoSymbol  ]};
+    key <AD05> {	[        t,               T,            thorn,           THORN  ]};
+    key <AD08> {	[        i,               I,         NoSymbol,        NoSymbol  ]};
+    key <AD09> {	[        o,               O,               oe,              OE  ]};
     key <AD11> {	[    aring,           Aring 	]};
-    key <AE12> {   	[ dead_acute,      dead_grave,              bar,       brokenbar	]};
-    key <AD12> {   	[ dead_diaeresis, dead_circumflex,       dead_tilde,      dead_caron      ]};
-
-    // End alphanumeric section
+    key <AD12> {	[ dead_diaeresis, dead_circumflex, dead_tilde,      dead_caron	]};
+    key <BKSL> {	[ apostrophe,      asterisk, dead_doubleacute,        multiply	]};
 
     include "eurosign(e)"
     include "level3(ralt_switch)"
@@ -52,7 +50,7 @@ xkb_symbols "nodeadkeys" {
     name[Group1]= "Denmark - Mac, eliminate dead keys";
 
     key <AE12> {	[           acute,           grave,              bar,          ogonek	]	};
-    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};
+    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron	]      	};
 };
 
 partial alphanumeric_keys
-- 
cgit v1.2.3