diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
| commit | 285bce5f59c5466a6fd1e3af601daa7cce066ea4 (patch) | |
| tree | e1a9205dd5acd2c0ef7dc8a20ec3fac3a3aecf7f /xorg-server/xkeyboard-config/keymap/sun_vndr/ru | |
| parent | f7eb7329c8efe023b304d5e66b08d1a998973220 (diff) | |
| parent | b91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff) | |
| download | vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.gz vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.bz2 vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/src/OpenDis.c
libX11/src/xcb_io.c
xorg-server/xkeyboard-config/keymap/sun_vndr/all.in
xorg-server/xkeyboard-config/semantics/default.in
Diffstat (limited to 'xorg-server/xkeyboard-config/keymap/sun_vndr/ru')
| -rw-r--r-- | xorg-server/xkeyboard-config/keymap/sun_vndr/ru | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/ru b/xorg-server/xkeyboard-config/keymap/sun_vndr/ru deleted file mode 100644 index 005f27f3c..000000000 --- a/xorg-server/xkeyboard-config/keymap/sun_vndr/ru +++ /dev/null @@ -1,59 +0,0 @@ -//
-//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_ru" {
- xkb_keycodes { include "sun(type4_euro)" };
- xkb_types { include "default" };
- xkb_compatibility { include "default" };
- xkb_symbols {
- include "sun_vndr/us(sun4)+iso9995-3(basic)+ru"
- };
- xkb_geometry { include "sun(type4)" };
-};
-xkb_keymap "type4_ru_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)+ru"
- };
- xkb_geometry { include "sun(type4)" };
-};
-default xkb_keymap "type5_ru" {
- xkb_keycodes { include "sun(type5_euro)" };
- xkb_types { include "default" };
- xkb_compatibility { include "default" };
- xkb_symbols {
- include "sun_vndr/us(sun5)+iso9995-3(basic)+ru"
- };
- xkb_geometry { include "sun(type5euro)" };
-};
-xkb_keymap "type5_ru_openlook" {
- xkb_keycodes { include "sun(type5_euro)" };
- xkb_types { include "default" };
- xkb_compatibility { include "default" };
- xkb_symbols { include "sun_vndr/us(sun5ol)+iso9995-3+ru" };
- xkb_geometry { include "sun(type5euro)" };
-};
|