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/intro.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/intro.html')
| -rw-r--r-- | docs/intro.html | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/docs/intro.html b/docs/intro.html index aae2e6e192..0806caf388 100644 --- a/docs/intro.html +++ b/docs/intro.html @@ -111,11 +111,9 @@ It implements the OpenGL 1.3 specification. <p> -November 2001: I cofound <a href="http://www.tungstengraphics.com" target="_parent"> -Tungsten Graphics, Inc.</a> with Keith Whitwell, Jens Owen, David Dawes and -Frank LaMonica. -I continue to develop Mesa as part of my resposibilities with Tungsten -Graphics and as a spare-time project. +November 2001: I cofounded Tungsten Graphics, Inc. with Keith Whitwell, +Jens Owen, David Dawes and Frank LaMonica. +Tungsten Graphics was acquired by VMware in December 2008. </p> <p> |