From 982ac918afe6a1c02d5cf735d7b6c56443a048cc Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 7 Feb 2014 23:28:38 +0100
Subject: xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb
 mesa xserver git update 7 Feb 2014

Update to openssl1.0.1f

xserver          commit 83e38eb73fd8c852513aac2da2975b4c01070ec2
libxcb           commit d7eb0bdf3b5b11ee9f40ee5e73df8fc0bdfa59f3
xkeyboard-config commit 7596672b96315465df8d8d691e3a567a52f70743
libX11           commit aacf95dacc7c598e7297894580d4d655593813b2
xkbcomp          commit 31b90ee4ffc774e0da540277907fc5540c0b012c
libxtrans        commit 3f0de269abe59353acbd7a5587d68ce0da91db67
fontconfig       commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d
mesa             commit dd2229d4c68ed78a50104637aef904f8ab6d7dd3
---
 xorg-server/xkeyboard-config/symbols/ca | 11 +++++------
 1 file changed, 5 insertions(+), 6 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 abfbbd9f7..2ba48b480 100644
--- a/xorg-server/xkeyboard-config/symbols/ca
+++ b/xorg-server/xkeyboard-config/symbols/ca
@@ -122,10 +122,10 @@ xkb_symbols "fr-dvorak" {
 partial
 xkb_symbols "fr-legacy" {
 
-    name[Group1] = "French (Canada, legacy)";
-
     include "ca(fr)"
 
+    name[Group1] = "French (Canada, legacy)";
+
     key <TLDE>	{ [    degree,     degree,       notsign ]	};
     key <AE01>	{ [         1,     exclam,   onesuperior ]	};
 
@@ -168,10 +168,10 @@ xkb_symbols "fr-legacy" {
 partial
 xkb_symbols "multi" {
 
-    name[Group1] = "Canadian Multilingual (first part)";
-
     include "ca(fr)"
 
+    name[Group1] = "Canadian Multilingual (first part)";
+
     key <TLDE>	{ [     slash,  backslash,           bar ]	};
     key <AE01>	{ [         1,     exclam ]	};
     key <AE02>	{ [         2,         at ]	};
@@ -259,7 +259,6 @@ xkb_symbols "multi-2gr" {
     key <AB08>	{ [ Greek_horizbar, multiply ]	};
     key <AB09>	{ [ periodcentered, division ]	};
     key <AB10>	{ [ NoSymbol, dead_abovedot ]	};
-
 };
 
 // based on
@@ -466,8 +465,8 @@ xkb_symbols "olpc" {
 
 partial alphanumeric_keys
 xkb_symbols "eng" {
-    name[Group1] = "English (Canada)";
     include "us(basic)"
+    name[Group1] = "English (Canada)";
 };
 
 // EXTRAS:
-- 
cgit v1.2.3