aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-10-02 11:13:08 +0200
committermarha <marha@users.sourceforge.net>2013-10-02 11:13:08 +0200
commitc3594c6c050a987fb891a1c7cf0c83102fbbec46 (patch)
tree33b215c07359fff941f32fc89a8cf3e968d334a9 /xorg-server/xkeyboard-config/Makefile.am
parent1881d1a5c46cc9efb394f84b69f58c000ee1118b (diff)
parent8092f320c341a6b3a1b428fdd4473859d5db8b79 (diff)
downloadvcxsrv-c3594c6c050a987fb891a1c7cf0c83102fbbec46.tar.gz
vcxsrv-c3594c6c050a987fb891a1c7cf0c83102fbbec46.tar.bz2
vcxsrv-c3594c6c050a987fb891a1c7cf0c83102fbbec46.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig mesa pixman xkeyboard-config git update 2 Okt 2013 Conflicts: mesalib/src/glsl/ast.h mesalib/src/glsl/glsl_parser_extras.h
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 ed3a0a326..e0b3168bc 100644
--- a/xorg-server/xkeyboard-config/Makefile.am
+++ b/xorg-server/xkeyboard-config/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = compat geometry keycodes po rules symbols types docs man
pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = xkeyboard-config.pc
-EXTRA_DIST=config.rpath COPYING CREDITS README \
+EXTRA_DIST=config.rpath COPYING README \
autogen.sh \
xkeyboard-config.pc.in \
intltool-extract.in intltool-merge.in intltool-update.in