diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-28 21:21:07 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-28 21:21:07 +0000 |
| commit | e85e0b6942e6eb9447fcf6c9a5045ba813aa6844 (patch) | |
| tree | 1fc646212f66bdf6449fe23b8a47813114095600 /xorg-server/xkbdata.src/keycodes | |
| parent | fedd99993946dd8fc22b60e3611e447f3b8092ca (diff) | |
| parent | 9370f043060a1d08bb51484a58c52db85a4ea656 (diff) | |
| download | vcxsrv-e85e0b6942e6eb9447fcf6c9a5045ba813aa6844.tar.gz vcxsrv-e85e0b6942e6eb9447fcf6c9a5045ba813aa6844.tar.bz2 vcxsrv-e85e0b6942e6eb9447fcf6c9a5045ba813aa6844.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/keycodes')
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/Makefile.am | 45 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/empty | 8 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/makefile | 27 |
3 files changed, 45 insertions, 35 deletions
diff --git a/xorg-server/xkbdata.src/keycodes/Makefile.am b/xorg-server/xkbdata.src/keycodes/Makefile.am index c289e1454..2876ca9f1 100644 --- a/xorg-server/xkbdata.src/keycodes/Makefile.am +++ b/xorg-server/xkbdata.src/keycodes/Makefile.am @@ -1,22 +1,23 @@ -SUBDIRS = digital_vndr sgi_vndr - -keycodesdir = $(xkb_base)/keycodes - -dist_keycodes_DATA = \ -aliases \ -amiga \ -ataritt \ -evdev \ -fujitsu \ -hp \ -ibm \ -macintosh \ -sony \ -sun \ -xfree86 \ -xfree98 \ -README - -dir_data = $(dist_keycodes_DATA) - -include $(top_srcdir)/xkbrules.am +SUBDIRS = digital_vndr sgi_vndr
+
+keycodesdir = $(xkb_base)/keycodes
+
+dist_keycodes_DATA = \
+aliases \
+amiga \
+ataritt \
+empty \
+evdev \
+fujitsu \
+hp \
+ibm \
+macintosh \
+sony \
+sun \
+xfree86 \
+xfree98 \
+README
+
+dir_data = $(dist_keycodes_DATA)
+
+include $(top_srcdir)/xkbrules.am
diff --git a/xorg-server/xkbdata.src/keycodes/empty b/xorg-server/xkbdata.src/keycodes/empty new file mode 100644 index 000000000..af0b18083 --- /dev/null +++ b/xorg-server/xkbdata.src/keycodes/empty @@ -0,0 +1,8 @@ +default xkb_keycodes "empty" {
+ minimum= 8;
+ maximum= 255;
+};
+default xkb_keycodes "empty" {
+ minimum= 8;
+ maximum= 255;
+};
diff --git a/xorg-server/xkbdata.src/keycodes/makefile b/xorg-server/xkbdata.src/keycodes/makefile index cdc1dde71..f22e67a93 100644 --- a/xorg-server/xkbdata.src/keycodes/makefile +++ b/xorg-server/xkbdata.src/keycodes/makefile @@ -9,19 +9,20 @@ DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR) SUBDIRS = digital_vndr sgi_vndr dist_xkbdata_keycodes_DATA = \ - aliases \ - amiga \ - ataritt \ - evdev \ - fujitsu \ - hp \ - ibm \ - macintosh \ - sony \ - sun \ - xfree86 \ - xfree98 \ - README +aliases \ +amiga \ +ataritt \ +empty \ +evdev \ +fujitsu \ +hp \ +ibm \ +macintosh \ +sony \ +sun \ +xfree86 \ +xfree98 \ +README DATA_FILES=$(dist_xkbdata_keycodes_DATA:%=$(DESTDIR)\%) |