Rémi Bernon : winex11.drv: Merge settings.c into display.c.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5cc3808a629b8517c3d7375284bfab9f01c818b2
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5cc3808a629b8517c3d7375284bfab9f01c818b2

Author: Rémi Bernon <rbernon at codeweavers.com>
Date:   Fri May 20 14:14:33 2022 +0200

winex11.drv: Merge settings.c into display.c.

Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>

---

 dlls/winex11.drv/Makefile.in |   1 -
 dlls/winex11.drv/display.c   | 962 +++++++++++++++++++++++++++++++++++++++++
 dlls/winex11.drv/settings.c  | 999 -------------------------------------------
 3 files changed, 962 insertions(+), 1000 deletions(-)

Diff:   https://source.winehq.org/git/wine.git/?a=commitdiff;h=5cc3808a629b8517c3d7375284bfab9f01c818b2