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/configure.in | |
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/configure.in')
-rw-r--r-- | xorg-server/xkeyboard-config/configure.in | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/xorg-server/xkeyboard-config/configure.in b/xorg-server/xkeyboard-config/configure.in index 4229f3fd9..3b9fac2e0 100644 --- a/xorg-server/xkeyboard-config/configure.in +++ b/xorg-server/xkeyboard-config/configure.in @@ -90,11 +90,6 @@ geometry/sgi_vndr/Makefile keycodes/Makefile keycodes/digital_vndr/Makefile keycodes/sgi_vndr/Makefile -keymap/Makefile -keymap/digital_vndr/Makefile -keymap/sgi_vndr/Makefile -keymap/sun_vndr/Makefile -semantics/Makefile rules/Makefile rules/bin/Makefile rules/compat/Makefile |