diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:31 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:31 +0000 |
| commit | e97c634593dd171a05aa0fa5a35d218dcc3ecfb0 (patch) | |
| tree | e0de50ad82b9890959a1a65d81a654935a1291bb /Xext | |
| parent | 4b75c7f6358b28978b05ffa4b73853d936454f50 (diff) | |
merge XFree86 RC2 (4.3.99.902) from vendor branch
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/security.c | 4 | ||||
| -rw-r--r-- | Xext/shm.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Xext/security.c b/Xext/security.c index 568138e36..bd52be407 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -1,3 +1,4 @@ +/* $XdotOrg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /* @@ -24,12 +25,13 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.17 2003/12/04 16:59:35 tsi Exp $ */ #include "dixstruct.h" #include "extnsionst.h" #include "windowstr.h" #include "inputstr.h" +#include "scrnintstr.h" #include "gcstruct.h" #include "colormapst.h" #include "propertyst.h" diff --git a/Xext/shm.c b/Xext/shm.c index 2ed8699f0..6c3664476 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -1,5 +1,5 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/shm.c,v 3.40 2003/11/17 22:20:27 dawes Exp $ */ -/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.40 2003/11/17 22:20:27 dawes Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/shm.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.42 2003/12/18 10:15:24 alanh Exp $ * /************************************************************ Copyright 1989, 1998 The Open Group |