From 95fb19d661154ba8cfc6c793a0daa25657294b3b Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 8 Apr 2013 08:17:23 +0200
Subject: fontconfig libXau mesa xserver xkeyboard-config git update 8 Apr 2013

xserver          commit 8928f8fa0bb154ce437af703ff702016f0dcf127
xkeyboard-config commit e5c6729f3679fe87a703eb1d7ec1cf0a61814ca8
libXau           commit f5a57d8a21a34d7084cce294e24c0422e02ef8ef
fontconfig       commit 18bf57c70aafcad031c0b43756b754dcaf6a756a
mesa             commit eff66bc9f855fff5c4f5f57f247254a97431e8ad
---
 xorg-server/xkeyboard-config/symbols/gb                | 3 ++-
 xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb | 4 +++-
 xorg-server/xkeyboard-config/symbols/md                | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/xorg-server/xkeyboard-config/symbols/gb b/xorg-server/xkeyboard-config/symbols/gb
index c7de8c33e..10372afcd 100644
--- a/xorg-server/xkeyboard-config/symbols/gb
+++ b/xorg-server/xkeyboard-config/symbols/gb
@@ -169,7 +169,8 @@ xkb_symbols "mac" {
 
     key <AE02> {	[               2,              at,         EuroSign	]	};
     key <AE03> {	[               3,        sterling,       numbersign	]	};
-    key <LSGT> {	[               grave,  asciitilde ]	};
+    key <TLDE> {	[         section,       plusminus ]	};
+    key <LSGT> {	[           grave,      asciitilde ]	};
 
     // End alphanumeric section
     
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
index a6bc48e8c..4e4248561 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
@@ -4,12 +4,14 @@ xkb_symbols "basic" {
     // Describes the differences between a very simple en_US
     // keyboard and a very simple U.K. keyboard layout
 
-    include "latin"
+    include "macintosh_vndr/us"
 
     name[Group1]= "United Kingdom - Mac";
 
     key <AE02> {	[               2,              at,         EuroSign	]	};
     key <AE03> {	[               3,        sterling,       numbersign	]	};
+    key <TLDE> {	[         section,       plusminus ]	};
+    key <LSGT> {	[           grave,      asciitilde ]	};
 
     // End alphanumeric section
     
diff --git a/xorg-server/xkeyboard-config/symbols/md b/xorg-server/xkeyboard-config/symbols/md
index 848fe05a7..f7700e930 100644
--- a/xorg-server/xkeyboard-config/symbols/md
+++ b/xorg-server/xkeyboard-config/symbols/md
@@ -38,7 +38,7 @@ name[Group1]="Moldavian (Gagauz)";
     // Alphanumeric section								
     key <TLDE> 	{	[	grave,	asciitilde			]	};
     key <AE01> 	{	[	1,	exclam			]	};
-    key <AE02> 	{	[	2,	quotedb1,	at		]	};
+    key <AE02> 	{	[	2,	quotedbl,	at	]	};
     key <AE03> 	{	[	3,	numbersign			]	};
     key <AE04> 	{	[	4,	semicolon,	dollar		]	};
     key <AE05> 	{	[	5,	percent,	EuroSign,	cent	]	};
-- 
cgit v1.2.3