Peter Hutterer beea2378f1 xfree86: don't overwrite option list (#32115) ...

Options set in the configuration file were unconditionally overwritten by
the server. Merge the already existing options and the new options together
instead of just overwriting ones.

Introduced in commit 2199842ed5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Thu Sep 2 10:52:54 2010 +1000

    xfree86: remove extraOptions field from IDevRec.

X.Org Bug 32115 <http://bugs.freedesktop.org/show_bug.cgi?id=32115>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: David Ronis <ronis@ronispc.chem.mcgill.ca>

2010-12-07 08:09:10 +10:00

..

dmx

Fix screen number checks.

2010-12-01 10:33:57 -08:00

kdrive

Fix screen number checks.

2010-12-01 10:33:57 -08:00

vfb

dix: Remove the backing store leftovers

2010-11-30 13:46:08 -05:00

xfree86

xfree86: don't overwrite option list (#32115)

2010-12-07 08:09:10 +10:00

xnest

dix: Remove the backing store leftovers

2010-11-30 13:46:08 -05:00

xquartz

dix: Remove the backing store leftovers

2010-11-30 13:46:08 -05:00

xwin

dix: Remove the backing store leftovers

2010-11-30 13:46:08 -05:00

Makefile.am

Catch errors in recursive relink targets

2010-03-22 00:45:57 -05:00