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/Makefile.am | |
| 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/Makefile.am')
| -rw-r--r-- | xorg-server/xkeyboard-config/keymap/Makefile.am | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/xorg-server/xkeyboard-config/keymap/Makefile.am b/xorg-server/xkeyboard-config/keymap/Makefile.am deleted file mode 100644 index 98da8f2b0..000000000 --- a/xorg-server/xkeyboard-config/keymap/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -SUBDIRS = digital_vndr sgi_vndr sun_vndr - -keymapdir = $(xkb_base)/keymap - -dist_keymap_DATA = \ -amiga ataritt macintosh \ -sony xfree86 xfree98 \ -README - -dir_data = $(dist_keymap_DATA) - -include $(top_srcdir)/xkbrules.am |