diff options
author | marha <marha@users.sourceforge.net> | 2011-02-20 14:23:37 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-02-20 14:23:37 +0000 |
commit | 684eb992146cad24b690073f33b909f47150b841 (patch) | |
tree | 7bc62d6f06c5e8a8114b56fa78485cb7ec08f26b /xorg-server/xkeyboard-config/keymap/sun_vndr/fr | |
parent | 53810445215dc45ae303bc89feb6e0aaf04aa6fa (diff) | |
parent | 8a191c08ddda2e66fa26f148d6c21959bb08f923 (diff) | |
download | vcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.gz vcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.bz2 vcxsrv-684eb992146cad24b690073f33b909f47150b841.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/keymap/sun_vndr/fr')
-rw-r--r-- | xorg-server/xkeyboard-config/keymap/sun_vndr/fr | 121 |
1 files changed, 59 insertions, 62 deletions
diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/fr b/xorg-server/xkeyboard-config/keymap/sun_vndr/fr index 9301ce031..8e15ca017 100644 --- a/xorg-server/xkeyboard-config/keymap/sun_vndr/fr +++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/fr @@ -1,62 +1,59 @@ -// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $ -// -//Copyright 1996, 1998 The Open Group -// -//Permission to use, copy, modify, distribute, and sell this software and its -//documentation for any purpose is hereby granted without fee, provided that -//the above copyright notice appear in all copies and that both that -//copyright notice and this permission notice appear in supporting -//documentation. -// -//The above copyright notice and this permission notice shall be -//included in all copies or substantial portions of the Software. -// -//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -//OTHER DEALINGS IN THE SOFTWARE. -// -//Except as contained in this notice, the name of The Open Group shall -//not be used in advertising or otherwise to promote the sale, use or -//other dealings in this Software without prior written authorization -//from The Open Group. -// -// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/fr,v 1.2 2000/10/28 00:34:05 dawes Exp $ -// -xkb_keymap "type4_fr" { - xkb_keycodes { include "sun(type4_euro)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { - include "sun_vndr/us(sun4)+iso9995-3(basic)+fr" - }; - xkb_geometry { include "sun(type4)" }; -}; -xkb_keymap "type4_fr_openlook" { - xkb_keycodes { include "sun(type4_euro)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { - include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fr" - }; - xkb_geometry { include "sun(type4)" }; -}; -default xkb_keymap "type5_fr" { - xkb_keycodes { include "sun(type5_euro)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { - include "sun_vndr/us(sun5)+iso9995-3(basic)+fr" - }; - xkb_geometry { include "sun(type5euro)" }; -}; -xkb_keymap "type5_fr_openlook" { - xkb_keycodes { include "sun(type5_euro)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "sun_vndr/us(sun5ol)+iso9995-3+fr" }; - xkb_geometry { include "sun(type5euro)" }; -}; +//
+//Copyright 1996, 1998 The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+xkb_keymap "type4_fr" {
+ xkb_keycodes { include "sun(type4_euro)" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols {
+ include "sun_vndr/us(sun4)+iso9995-3(basic)+fr"
+ };
+ xkb_geometry { include "sun(type4)" };
+};
+xkb_keymap "type4_fr_openlook" {
+ xkb_keycodes { include "sun(type4_euro)" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols {
+ include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fr"
+ };
+ xkb_geometry { include "sun(type4)" };
+};
+default xkb_keymap "type5_fr" {
+ xkb_keycodes { include "sun(type5_euro)" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols {
+ include "sun_vndr/us(sun5)+iso9995-3(basic)+fr"
+ };
+ xkb_geometry { include "sun(type5euro)" };
+};
+xkb_keymap "type5_fr_openlook" {
+ xkb_keycodes { include "sun(type5_euro)" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols { include "sun_vndr/us(sun5ol)+iso9995-3+fr" };
+ xkb_geometry { include "sun(type5euro)" };
+};
|