diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-06-19 17:20:52 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-06-19 17:20:52 +0930 |
| commit | 1f97a7647606226cde61d6ad7a94f2b0b571a06c (patch) | |
| tree | 63959752648b4f3bcfe4ac271d0a714dfcd93280 /Xext/Makefile.am | |
| parent | 5dee64fc99f34e091abce65d47c4b6f026ab4849 (diff) | |
| parent | 2e7fef7d0837939e822c40b6ac77e7f0e66d57bd (diff) | |
Merge branch 'master' into mpx
Conflicts:
dix/devices.c
hw/xfree86/common/xf86Xinput.c
hw/xfree86/loader/xf86sym.c
mi/mieq.c
Diffstat (limited to 'Xext/Makefile.am')
| -rw-r--r-- | Xext/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am index 29a01ee99..2fcac89a3 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -35,7 +35,6 @@ MODULE_SRCS = \ xcmisc.c # Extra configuration files ship with some extensions -SERVERCONFIGdir = $(libdir)/xserver SERVERCONFIG_DATA = # Optional sources included if extension enabled by configure.ac rules |