diff options
author | marha <marha@users.sourceforge.net> | 2013-01-07 12:17:07 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-01-07 12:17:07 +0100 |
commit | 0e950715b62dcf30ffbf69831bf932fd348537e5 (patch) | |
tree | 83fdafc455e9906f029e2e1ad926fb35c98e7be9 /xorg-server/xkeyboard-config/symbols/gr | |
parent | 506537495e6d808f219361a5b270510c752e7a2e (diff) | |
parent | 3f553aaceddc9b09363c73d9bea40eaea8164fc4 (diff) | |
download | vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.gz vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.bz2 vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git update 7 jan 2013
Conflicts:
fontconfig/src/fcatomic.c
pixman/pixman/pixman-mmx.c
pixman/pixman/pixman-sse2.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/wincursor.c
xorg-server/hw/xwin/winmsg.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winsetsp.c
xorg-server/hw/xwin/winwin32rootless.c
xorg-server/xfixes/cursor.c
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols/gr')
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/gr | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/gr b/xorg-server/xkeyboard-config/symbols/gr index f4364cf89..d7d126009 100644 --- a/xorg-server/xkeyboard-config/symbols/gr +++ b/xorg-server/xkeyboard-config/symbols/gr @@ -73,7 +73,7 @@ xkb_symbols "simple" { key <AE12> { [ equal, plus ] }; // = + key <AD11> { [ bracketleft, braceleft ] }; // [ { - key <AD12> { [ bracketright, braceright ] }; // [ { + key <AD12> { [ bracketright, braceright ] }; // ] } key <AC11> { [ apostrophe, quotedbl ] }; // ' " @@ -180,7 +180,9 @@ xkb_symbols "polytonic" { key <AD12> { [ dead_iota, VoidSymbol, dead_breve ] }; // ͺ ˘ key <AC10> { [ dead_acute, dead_psili ] }; // ´ ̓ - key <AC11> { [ dead_grave, dead_dasia ] }; // ` ̔ + key <AC11> { type[Group1]="FOUR_LEVEL", + [ dead_grave, dead_dasia, apostrophe, quotedbl ] }; + // ` ̔ ' " }; partial alphanumeric_keys alternate_group |