diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:12 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:12 +0000 |
commit | 505fe2ba307e9270627ca7f3cb6b4e1dbacc327b (patch) | |
tree | ad19dfe52ca3f84a6f669acac195d296ed38ad08 /GL/glx/single2.c | |
parent | 1b22db1ebcf1ba98ca8519fa38210e275373f8f6 (diff) |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat (limited to 'GL/glx/single2.c')
-rw-r--r-- | GL/glx/single2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/GL/glx/single2.c b/GL/glx/single2.c index 3120ae171..c757d60bd 100644 --- a/GL/glx/single2.c +++ b/GL/glx/single2.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.9 2004/02/11 09:18:15 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.8 2004/02/10 22:54:15 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free |