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

Conflicts:

	Xext/appgroup.c
This commit is contained in:
Alan Coopersmith
2006-06-21 16:23:31 -07:00
committed by Alan Coopersmith
14 changed files with 127 additions and 19 deletions

View File

@@ -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 */