diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 18:54:16 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:54:16 +0000 |
commit | 0664db19bf37f9dd69cca6adff4e238e310c3092 (patch) | |
tree | d2cc9d3132d40796018a853df38877fa5b027f18 /GL/apple | |
parent | 9d24a5fa91bf165bbd2048a844edeb59b5e34aad (diff) |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'GL/apple')
-rw-r--r-- | GL/apple/aglGlx.c | 2 | ||||
-rw-r--r-- | GL/apple/indirect.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/GL/apple/aglGlx.c b/GL/apple/aglGlx.c index ae3276a02..106a6464d 100644 --- a/GL/apple/aglGlx.c +++ b/GL/apple/aglGlx.c @@ -32,7 +32,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */ #include "quartzCommon.h" #include <AGL/agl.h> diff --git a/GL/apple/indirect.c b/GL/apple/indirect.c index b1292b606..c4d235a47 100644 --- a/GL/apple/indirect.c +++ b/GL/apple/indirect.c @@ -34,7 +34,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */ #include "dri.h" #include "quartz.h" |