aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkbdata.src/symbols/us
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-20 20:25:03 +0000
committermarha <marha@users.sourceforge.net>2009-09-20 20:25:03 +0000
commit6341b97eda007223acfe2f7a64dc2c5718867e0a (patch)
tree1793a3e7cda31b9455df3106b60cc01a096b43f7 /xorg-server/xkbdata.src/symbols/us
parent650fd857a97752ff5ff8b1654ec78b813b78d9c2 (diff)
parentf3d88db0960f1c23e55f2529764b096ac92d78d9 (diff)
downloadvcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.tar.gz
vcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.tar.bz2
vcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.zip
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/symbols/us')
-rw-r--r--xorg-server/xkbdata.src/symbols/us10
1 files changed, 5 insertions, 5 deletions
diff --git a/xorg-server/xkbdata.src/symbols/us b/xorg-server/xkbdata.src/symbols/us
index 20a1b57f4..c732de64b 100644
--- a/xorg-server/xkbdata.src/symbols/us
+++ b/xorg-server/xkbdata.src/symbols/us
@@ -91,7 +91,7 @@ xkb_symbols "intl" {
key <AE02> { [ 2, at, twosuperior, dead_doubleacute ] };
key <AE03> { [ 3, numbersign, threesuperior, dead_macron ] };
key <AE04> { [ 4, dollar, currency, sterling ] };
- key <AE05> { [ 5, percent, EuroSign ] };
+ key <AE05> { [ 5, percent, EuroSign, dead_cedilla ] };
key <AE06> { [ 6, dead_circumflex, onequarter, asciicircum ] };
key <AE07> { [ 7, ampersand, onehalf, dead_horn ] };
key <AE08> { [ 8, asterisk, threequarters, dead_ogonek ] };
@@ -765,11 +765,11 @@ xkb_symbols "altgr-intl" {
key <AB02> { [ x, X, oe, OE ] };
key <AB04> { [ v, V, registered, registered ] };
-// onequarter etc (not in iso8859-15) deleted to get three unshifted deadkeys:
+// onequarter etc (not in iso8859-15) moved to get three unshifted deadkeys:
- key <AE06> { [ 6, asciicircum, dead_circumflex ] };
- key <AE07> { [ 7, ampersand, dead_horn ] };
- key <AE08> { [ 8, asterisk, dead_ogonek ] };
+ key <AE06> { [ 6, asciicircum, dead_circumflex, onequarter ] };
+ key <AE07> { [ 7, ampersand, dead_horn, onehalf ] };
+ key <AE08> { [ 8, asterisk, dead_ogonek, threequarters ] };
include "level3(ralt_switch)"
};