Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

Conflicts: Xext/appgroup.c
2006-06-21 16:23:31 -07:00
parent 3e098efa35 77c947b900
commit 90af38fa0c
14 changed files with 127 additions and 19 deletions
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -111,7 +111,7 @@ int ProcInitialConnection();
 #include "xace.h"
 #endif
 #ifdef XAPPGROUP
-#include <X11/extensions/Xagsrv.h>
+#include "appgroup.h"
 #endif
 #ifdef XKB
 #ifndef XKB_IN_SERVER