diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-06-21 16:23:31 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alanc@alf.(none)> | 2006-06-21 16:23:31 -0700 |
| commit | 90af38fa0c46c2081d2becac262a614c26ba6ef1 (patch) | |
| tree | c13dad117611a78caef93ef0d1d795976b4df8a7 /Xext/security.c | |
| parent | 3e098efa35ba70ad4d5699af3130a3b02e1cb06e (diff) | |
| parent | 77c947b900faf34f425eef1549d8210c475e093b (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:
Xext/appgroup.c
Diffstat (limited to 'Xext/security.c')
| -rw-r--r-- | Xext/security.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Xext/security.c b/Xext/security.c index f80d46406..b96ac28c3 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -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 */ |