diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-06-11 15:29:11 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-06-11 15:29:11 -0400 |
| commit | e2a720c9a17dc860ee0a858c2b21fd71e86cdcd0 (patch) | |
| tree | 980937a838242092b0ec6b9cfc89b39af99d045b /Xext | |
| parent | 878cac71aa0018deee861b297638c0744dba631b (diff) | |
| parent | 3f9adb18f127318d054f30a57e3a77176e14c692 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/dixutils.c
Diffstat (limited to 'Xext')
| -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 be04c849a..3593c1428 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -34,7 +34,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 |