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/ca | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

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

diff --git a/xorg-server/xkeyboard-config/symbols/ca b/xorg-server/xkeyboard-config/symbols/ca
index e93995302..b039c48ff 100644
--- a/xorg-server/xkeyboard-config/symbols/ca
+++ b/xorg-server/xkeyboard-config/symbols/ca
@@ -323,8 +323,6 @@ xkb_symbols "ike" {
     key	<TLDE> { [ 0x0100157b, 0x01001575	]	};
     key	<LSGT> { [ 0x01001579, 0x01001577	]	};
     key	<BKSL> { [ backslash,  bar		]	};
-
-// End alphanumeric section
 };
 
 partial
@@ -477,13 +475,11 @@ xkb_symbols "eng" {
 partial alphanumeric_keys 
 xkb_symbols "kut" {
 
-    //Ejective U0313  and compose accents are from shs layout
+    // Ejective U0313 and acute accents are taken from shs layout.
     include "ca(shs)"
 
     name[Group1]= "Kutenai";
 
-    // Alphanumeric section
-
     // Alveolar Click
     key <AD05> {	[ t,	T,U01C2	,U01C2	]	};
 
@@ -505,7 +501,6 @@ xkb_symbols "kut" {
 
 // Secwepemctsin keyboard for X11
 // written by Neskie Manuel <neskiem@gmail.com>
-
 partial alphanumeric_keys  
 xkb_symbols "shs" {
 
@@ -513,9 +508,9 @@ xkb_symbols "shs" {
 
     name[Group1]= "Secwepemctsin";
 
-    //Using Dead key to get COMBINING COMMA ABOVE for ejectives on
-    //q, l, t, s, m, g, k, p, w, y, r
-    //XCompose key is used for the other accute and grave.
+    // Using a "dead key" to get a COMBINING COMMA ABOVE
+    // for ejectives on q, l, t, s, m, g, k, p, w, y, r.
+    // The Compose key is used for the other acutes and grave.
 
     key <AB08>	{ [ comma, less, U0313    ]	};
     key <AC01>	{ [ a, A, aacute, Aacute  ]	};
-- 
cgit v1.2.3