diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-09-02 18:31:49 +0200 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-09-02 18:31:49 +0200 |
| commit | 222d2f2ac2c7d93cbc0643082c78278ad2c8cfce (patch) | |
| tree | b79152c238022b2a901201c22e5809ac520732bf /docs/subset-A.html | |
| parent | 443abc80db9e1a288ce770e76cccd43664348098 (diff) | |
| parent | e73c5501b2fe20290d1b691c85a5d82ac3a0431c (diff) | |
Merge remote branch 'origin/master' into nv50-compiler
Conflicts:
src/gallium/drivers/nv50/nv50_program.c
Diffstat (limited to 'docs/subset-A.html')
| -rw-r--r-- | docs/subset-A.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/subset-A.html b/docs/subset-A.html index dac66a61ba..d576bb6744 100644 --- a/docs/subset-A.html +++ b/docs/subset-A.html @@ -16,8 +16,7 @@ </h3> </center> </h2> -<p> Copyright © 2002-2003 by <a - href="http://www.tungstengraphics.com/">Tungsten Graphics, Inc.</a>, +<p> Copyright © 2002-2003 by Tungsten Graphics, Inc., Cedar Park, Texas. All Rights Reserved. <br> <br> Permission is granted to make and distribute verbatim copies of this |