mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts: Xext/appgroup.c
This commit is contained in:
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <assert.h>
|
||||
#include <stdarg.h>
|
||||
#ifdef XAPPGROUP
|
||||
#include <X11/extensions/Xagsrv.h>
|
||||
#include "appgroup.h"
|
||||
#endif
|
||||
#include <stdio.h> /* for file reading operations */
|
||||
#include <X11/Xatom.h> /* for XA_STRING */
|
||||
|
||||
Reference in New Issue
Block a user