mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 08:04:30 +00:00
Merge branch 'master' into XACE-SELINUX
Conflicts: include/miscstruct.h mi/mibstore.c mi/midispcur.c os/Makefile.am
This commit is contained in:
@@ -50,7 +50,7 @@ SOFTWARE.
|
||||
|
||||
#include "misc.h"
|
||||
#include <X11/Xprotostr.h>
|
||||
#include <pixman/pixman.h>
|
||||
#include <pixman.h>
|
||||
|
||||
typedef xPoint DDXPointRec;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user