aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-03-12 08:32:17 +0100
committermarha <marha@users.sourceforge.net>2012-03-12 08:32:17 +0100
commit285bce5f59c5466a6fd1e3af601daa7cce066ea4 (patch)
treee1a9205dd5acd2c0ef7dc8a20ec3fac3a3aecf7f /xorg-server/xkeyboard-config/Makefile.am
parentf7eb7329c8efe023b304d5e66b08d1a998973220 (diff)
parentb91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff)
downloadvcxsrv-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/Makefile.am')
-rw-r--r--xorg-server/xkeyboard-config/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/xkeyboard-config/Makefile.am b/xorg-server/xkeyboard-config/Makefile.am
index fe8f08c84..ed3a0a326 100644
--- a/xorg-server/xkeyboard-config/Makefile.am
+++ b/xorg-server/xkeyboard-config/Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs man
+SUBDIRS = compat geometry keycodes po rules symbols types docs man
pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = xkeyboard-config.pc