diff options
author | marha <marha@users.sourceforge.net> | 2011-06-03 08:22:14 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-06-03 08:22:14 +0200 |
commit | 6aea3a7470dfb2c513378b82c27f0ad87afda7f3 (patch) | |
tree | cefb863bdf986b740d8f9475514df400a56ff003 /xorg-server/xkeyboard-config/symbols/lk | |
parent | 5e835037510a4ccf001fb8f0a9aed29a28072fec (diff) | |
parent | cda19b1d226d565f1ca4327aeae827c621b3dfd6 (diff) | |
download | vcxsrv-6aea3a7470dfb2c513378b82c27f0ad87afda7f3.tar.gz vcxsrv-6aea3a7470dfb2c513378b82c27f0ad87afda7f3.tar.bz2 vcxsrv-6aea3a7470dfb2c513378b82c27f0ad87afda7f3.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/configs/linux-dri
mesalib/src/gallium/auxiliary/util/u_math.h
mesalib/src/mapi/glapi/gen/Makefile
mesalib/src/mapi/glapi/glapi_mapi_tmp.h
mesalib/src/mapi/glapi/glapi_sparc.S
mesalib/src/mapi/glapi/glapi_x86-64.S
mesalib/src/mapi/glapi/glapi_x86.S
mesalib/src/mapi/glapi/glapitable.h
mesalib/src/mapi/glapi/glapitemp.h
mesalib/src/mapi/glapi/glprocs.h
mesalib/src/mesa/drivers/dri/Makefile.template
mesalib/src/mesa/main/dd.h
mesalib/src/mesa/main/fbobject.c
mesalib/src/mesa/main/remap_helper.h
mesalib/src/mesa/main/shaderapi.c
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/main/uniforms.c
mesalib/src/mesa/state_tracker/st_format.c
mesalib/src/mesa/vbo/vbo_exec_array.c
xorg-server/configure.ac
xorg-server/dix/main.c
xorg-server/dix/window.c
xorg-server/hw/xquartz/GL/indirect.c
xorg-server/hw/xquartz/X11Application.m
xorg-server/hw/xquartz/darwin.c
xorg-server/hw/xquartz/darwin.h
xorg-server/hw/xquartz/mach-startup/Makefile.am
xorg-server/hw/xquartz/pbproxy/app-main.m
xorg-server/hw/xquartz/pbproxy/pbproxy.h
xorg-server/hw/xquartz/pbproxy/x-selection.m
xorg-server/hw/xquartz/xpr/xpr.h
xorg-server/hw/xquartz/xpr/xprEvent.c
xorg-server/hw/xquartz/xpr/xprScreen.c
xorg-server/include/privates.h
xorg-server/include/protocol-versions.h
xorg-server/test/Makefile.am
xorg-server/xfixes/cursor.c
xorg-server/xfixes/xfixes.c
xorg-server/xkeyboard-config/configure.in
xorg-server/xkeyboard-config/rules/base.extras.xml.in
xorg-server/xkeyboard-config/rules/base.xml.in
xorg-server/xkeyboard-config/symbols/de
xorg-server/xkeyboard-config/symbols/lk
xorg-server/xkeyboard-config/symbols/ru
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols/lk')
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/lk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/lk b/xorg-server/xkeyboard-config/symbols/lk index ee929ba01..c4fd2ae50 100644 --- a/xorg-server/xkeyboard-config/symbols/lk +++ b/xorg-server/xkeyboard-config/symbols/lk @@ -1,6 +1,6 @@ // X Keyboard Extension file for Sinhala (Sri Lanka) (2004-04-22)
// Maintainer : Harshula Jayasuriya <harshula@gmail.com>
-// Last Updated: 2011-03-20
+// Last Updated: 2011-05-25
// This is a phonetic static mapping for a standard US-English keyboard
// (qwerty)
// http://www.nongnu.org/sinhala/doc/keymaps/sinhala-keyboard_3.html
@@ -32,8 +32,7 @@ partial default alphanumeric_keys xkb_symbols "sin_phonetic" {
include "us"
-// it is default - no details in the name
- name[Group1] = "Sinhala";
+ name[Group1] = "Sinhala (phonetic)";
key.type[Group1] = "FOUR_LEVEL";
// q - p
|