mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-29 21:46:40 +00:00
Merge branch 'master' into XACE-SELINUX
Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c
This commit is contained in:
commit
a52c9b2a59
270 changed files with 1593 additions and 1827 deletions
|
|
@ -36,7 +36,8 @@ is" without express or implied warranty.
|
|||
DevPrivateKey xnestPixmapPrivateKey = &xnestPixmapPrivateKey;
|
||||
|
||||
PixmapPtr
|
||||
xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
|
||||
xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
|
||||
unsigned usage_hint)
|
||||
{
|
||||
PixmapPtr pPixmap;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue