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/macintosh | |
| 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/macintosh')
| -rw-r--r-- | xorg-server/xkeyboard-config/geometry/macintosh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/xorg-server/xkeyboard-config/geometry/macintosh b/xorg-server/xkeyboard-config/geometry/macintosh index 1e0e125d7..b6251b4f0 100644 --- a/xorg-server/xkeyboard-config/geometry/macintosh +++ b/xorg-server/xkeyboard-config/geometry/macintosh @@ -149,7 +149,6 @@ default xkb_geometry "macintosh" { }; }; // End of "Editing" section - // Begin of "Keypad" section section "Keypad" { top = 87; left = 380; @@ -301,7 +300,6 @@ xkb_geometry "applepro" { }; }; // End of "Editing" section - // Begin of "Keypad" section section "Keypad" { top = 48; left = 370; @@ -544,7 +542,6 @@ xkb_geometry "macbook79" { <KPEN> }; }; - }; // End of "Alpha" section key.shape= "ARRO"; @@ -565,7 +562,7 @@ xkb_geometry "macbook79" { alias <AC00> = <CAPS>; alias <AA00> = <LCTL>; -}; // End of "default" geometry +}; // Aluminium Keyboard, ANSI model (United States, 109 keys) |