diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-06 13:39:40 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-06 13:39:40 +0200 |
| commit | d53900c52abc2402f978b72278712e4bcdbde9f2 (patch) | |
| tree | 689cedc44df148a96d68ef460cff6b1756f096b6 /xorg-server/xkeyboard-config/geometry/kinesis | |
| parent | 36eb733ed5aaaeaefc49c8894bf213d16b58d242 (diff) | |
| parent | 2414a1de3cc17f438219f8f2a58b530d33e99a5e (diff) | |
| download | vcxsrv-d53900c52abc2402f978b72278712e4bcdbde9f2.tar.gz vcxsrv-d53900c52abc2402f978b72278712e4bcdbde9f2.tar.bz2 vcxsrv-d53900c52abc2402f978b72278712e4bcdbde9f2.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman xserver xkeyboard-config
Conflicts:
xorg-server/dix/dispatch.c
Diffstat (limited to 'xorg-server/xkeyboard-config/geometry/kinesis')
| -rw-r--r-- | xorg-server/xkeyboard-config/geometry/kinesis | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/geometry/kinesis b/xorg-server/xkeyboard-config/geometry/kinesis index f71cec8c5..1e1b8233b 100644 --- a/xorg-server/xkeyboard-config/geometry/kinesis +++ b/xorg-server/xkeyboard-config/geometry/kinesis @@ -159,7 +159,7 @@ default xkb_geometry "model100" { left= 39; keys { <LALT>, <HOME>, <END> }; }; - }; // End of "RightEdit" section + }; // End of "LeftEdit" section section "RightEdit" { top= 109; @@ -182,7 +182,7 @@ default xkb_geometry "model100" { overlay "KPAD" { <SPCE>= <KP0> }; - }; // End of "Keypad" section + }; // End of "RightEdit" section alias <AC00> = <CAPS>; alias <AA00> = <LCTL>; |