aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkbdata.src/symbols/ca
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-24 18:07:33 +0000
committermarha <marha@users.sourceforge.net>2009-07-24 18:07:33 +0000
commita16c0d6f73877af35ea0519917a82d5919e3c304 (patch)
treeb575998554afa00acc1086ff0a5ef17785c75326 /xorg-server/xkbdata.src/symbols/ca
parent0489d8cc5cc2f0bbdbee7aa2ed771ca0d42f30aa (diff)
parentea63f0fae5c393ccf198aad0ae4dbda6d2a4391a (diff)
downloadvcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.tar.gz
vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.tar.bz2
vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/symbols/ca')
-rw-r--r--xorg-server/xkbdata.src/symbols/ca20
1 files changed, 17 insertions, 3 deletions
diff --git a/xorg-server/xkbdata.src/symbols/ca b/xorg-server/xkbdata.src/symbols/ca
index c198fafd9..818a8ff7b 100644
--- a/xorg-server/xkbdata.src/symbols/ca
+++ b/xorg-server/xkbdata.src/symbols/ca
@@ -476,9 +476,16 @@ xkb_symbols "shs" {
// OLPC Section
xkb_symbols "olpc" {
- include "fr"
-
- key <AE03> { [ 3, slash, ograve, Ograve ] };
+ include "ca(fr)"
+
+ key <AE02> { [ 2, quotedbl, ograve, Ograve ] };
+ key <AE03> { [ 3, slash, at, VoidSymbol ] };
+
+ key <AD03> { [ e, E, EuroSign, VoidSymbol] };
+
+ key <AB09> { [ period, period, 0x1002010 ] };
+
+ key <I219> { [ guillemotleft, guillemotright, degree, VoidSymbol ] };
};
partial alphanumeric_keys
@@ -509,3 +516,10 @@ xkb_symbols "kut" {
//MODIFIER LETTER RIGHT HALF RING
key <AC10> { [ semicolon, colon,U02BE,U02BE ] };
};
+
+partial alphanumeric_keys
+xkb_symbols "eng" {
+ name[Group1] = "Canada - English";
+ include "us(basic)"
+};
+