xserver/hw
Matthieu Herrb efe69b4555 Don't clobber input device options from xorg.conf
Since commit b8d9c5ff removed commonOptions, we now
need to append the "Core{Keyboard,Pointer}" options to
the existing list.

Fixes passing options to devices confirured in xorg.conf
on systems where autoaddevices is false.

Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 00779932de)
2011-03-27 22:05:37 -07:00
..
dmx hw/dmx/doc: Add explicit dependency for all doxygen output files 2011-02-25 20:28:58 -08:00
kdrive man: refactor common code in the man pages makefiles 2011-01-18 15:11:10 -08:00
vfb man: refactor common code in the man pages makefiles 2011-01-18 15:11:10 -08:00
xfree86 Don't clobber input device options from xorg.conf 2011-03-27 22:05:37 -07:00
xnest man: refactor common code in the man pages makefiles 2011-01-18 15:11:10 -08:00
xquartz XQuartz: pbproxy: Protect against possible collision between Cocoa and X11 Cursor types 2011-03-03 18:15:16 -08:00
xwin hw/xwin: Look for gl spec files in $(srcdir) or . 2011-02-25 20:27:03 -08:00
Makefile.am Catch errors in recursive relink targets 2010-03-22 00:45:57 -05:00