diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:46 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:46 +0000 |
| commit | 38f37a3854c401f1347b86e1f676d0f62cc30868 (patch) | |
| tree | f02406f59bf7a126c6b093fd0b6a70d3d5a251b4 /GL/glx/glxpix.c | |
| parent | 1f71928430af1fa906bfd6c3afae5656588b5969 (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that had
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'GL/glx/glxpix.c')
| -rw-r--r-- | GL/glx/glxpix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/GL/glx/glxpix.c b/GL/glx/glxpix.c index b21d4ade9..cca2105ba 100644 --- a/GL/glx/glxpix.c +++ b/GL/glx/glxpix.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.4 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.3 2000/09/26 15:57:02 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free |