diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-21 10:37:30 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-21 10:37:30 +0200 |
| commit | 84f6a75a56f4749f91a51a161c1989cbc8807b80 (patch) | |
| tree | e72d3e4ee697bb7f35a2dccb6f17edf3a03a6d78 /xorg-server/config/Makefile.am | |
| parent | 6ac57d622cdabb2db9f8dce51f0313892e6bd1aa (diff) | |
| parent | 7f9fb534564d0eb8a62cf444e569a07166e5ee03 (diff) | |
| download | vcxsrv-84f6a75a56f4749f91a51a161c1989cbc8807b80.tar.gz vcxsrv-84f6a75a56f4749f91a51a161c1989cbc8807b80.tar.bz2 vcxsrv-84f6a75a56f4749f91a51a161c1989cbc8807b80.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 21 June 2013
Conflicts:
xorg-server/hw/xwin/windialogs.c
xorg-server/hw/xwin/winmultiwindowclass.c
Diffstat (limited to 'xorg-server/config/Makefile.am')
| -rw-r--r-- | xorg-server/config/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/config/Makefile.am b/xorg-server/config/Makefile.am index 69bdcf730..da81d7712 100644 --- a/xorg-server/config/Makefile.am +++ b/xorg-server/config/Makefile.am @@ -11,7 +11,7 @@ libconfig_la_LIBADD = $(UDEV_LIBS) if XORG xorgconfddir = $(datadir)/X11/$(XF86CONFIGDIR) -xorgconfd_DATA = 10-evdev.conf +xorgconfd_DATA = 10-evdev.conf 10-quirks.conf endif else @@ -44,4 +44,4 @@ endif # CONFIG_NEED_DBUS endif # !CONFIG_UDEV -EXTRA_DIST = xorg-server.conf x11-input.fdi 10-evdev.conf fdi2iclass.py +EXTRA_DIST = xorg-server.conf x11-input.fdi 10-evdev.conf fdi2iclass.py 10-quirks.conf |