diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
| commit | fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf (patch) | |
| tree | c59c3e084f79bd1f6060f9a5cedb5c48d4da14ee /xorg-server/xkeyboard-config/Makefile.am | |
| parent | 5d6e342b3c2d0d3607b184b1472b816228839e3f (diff) | |
| parent | 528f5bd58a139174170c4130c67dca30193c9057 (diff) | |
| download | vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.gz vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.bz2 vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
Diffstat (limited to 'xorg-server/xkeyboard-config/Makefile.am')
| -rw-r--r-- | xorg-server/xkeyboard-config/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/Makefile.am b/xorg-server/xkeyboard-config/Makefile.am index 943539fc6..fe8f08c84 100644 --- a/xorg-server/xkeyboard-config/Makefile.am +++ b/xorg-server/xkeyboard-config/Makefile.am @@ -8,8 +8,6 @@ pkgconfig_DATA = xkeyboard-config.pc EXTRA_DIST=config.rpath COPYING CREDITS README \ autogen.sh \ xkeyboard-config.pc.in \ - xkeyboard-config.spec \ - xkeyboard-config.spec.in \ intltool-extract.in intltool-merge.in intltool-update.in DISTCLEANFILES=intltool-extract intltool-merge intltool-update |