mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-26 21:12:25 +00:00
Merge branch 'master' into mpx
Conflicts: Xext/xprint.c (removed in master) config/hal.c dix/main.c hw/kdrive/ati/ati_cursor.c (removed in master) hw/kdrive/i810/i810_cursor.c (removed in master) hw/xprint/ddxInit.c (removed in master) xkb/ddxLoad.c
This commit is contained in:
commit
99d28c3ef3
763 changed files with 4494 additions and 104250 deletions
|
|
@ -17,7 +17,6 @@ extern Bool screenSaverSuspended;
|
|||
|
||||
extern char *defaultFontPath;
|
||||
extern int monitorResolution;
|
||||
extern Bool loadableFonts;
|
||||
extern int defaultColorVisualClass;
|
||||
|
||||
extern Bool Must_have_memory;
|
||||
|
|
|
|||
Loading…
Reference in a new issue