summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey V. Udaltsov <svu@gnome.org>2009-02-19 11:41:09 +0000
committerSergey V. Udaltsov <svu@gnome.org>2009-02-19 11:41:09 +0000
commitc9b5bf98adf95149cb5efec36939eaf5475e774f (patch)
tree00506fc56c8eed2b1e383d7ecd37517b2a742b4e
parente86ab43259d9f0f156b9981f8978a63cba5c4220 (diff)
downloadxkeyboard-config-c9b5bf98adf95149cb5efec36939eaf5475e774f.tar.gz
merged xfree86(jp106) keycodes into xfree86, dropped the unnecesssary rule
-rw-r--r--ChangeLog5
-rw-r--r--keycodes/evdev2
-rw-r--r--keycodes/xfree8611
3 files changed, 7 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 40d954e..3fac351 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-149 Sergey Udaltsov
+
+ * keycodes/evdev, keycodes/xfree86, rules/base.m_k.part: merged
+ xfree86(jp106) section to basic xfree86 keycodes
+
2009-02-14 Sergey Udaltsov
* symbols/sn, rules/base.xml.in, symbols/Makefile.am: added wolof
diff --git a/keycodes/evdev b/keycodes/evdev
index 9da2cd5..445c89e 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -50,6 +50,7 @@ default xkb_keycodes "evdev" {
<AC09> = 46;
<AC10> = 47;
<AC11> = 48;
+ <AC12> = 51;
<LFSH> = 50;
<AB01> = 52;
@@ -305,7 +306,6 @@ default xkb_keycodes "evdev" {
xkb_keycodes "jp106" {
include "evdev(evdev)"
<HZTG> = 49;
- <AC12> = 51;
};
// For brazilian ABNT2 keyboard.
diff --git a/keycodes/xfree86 b/keycodes/xfree86
index f140a84..1a67497 100644
--- a/keycodes/xfree86
+++ b/keycodes/xfree86
@@ -63,6 +63,7 @@ xkb_keycodes "basic" {
<AC09> = 46;
<AC10> = 47;
<AC11> = 48;
+ <AC12> = 51;
<LFSH> = 50;
<AB01> = 52;
@@ -400,16 +401,6 @@ xkb_keycodes "102" {
};
-// For japanese 106 keyboard. by tsuka(tsuka@kawalab.dnj.ynu.ac.jp)
-//
-// All of the keycodes here are now in the basic "xfree86" set.
-//
-xkb_keycodes "jp106" {
- include "xfree86(basic)"
- <AC12> = 51;
-};
-
-
// For brazilian ABNT2 keyboard. by Ricardo Y. Igarashi(iga@that.com.br)
xkb_keycodes "abnt2" {
include "xfree86(xfree86)"