diff options
| author | Brian Paul <brianp@vmware.com> | 2010-03-22 09:07:46 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-03-22 09:07:46 -0600 |
| commit | 182c42c8da6edfa66819eef02f4dea310c1f68d7 (patch) | |
| tree | f49df694eae81c9db3c8fe2123bb30ef5a556891 /docs | |
| parent | 5cb4a3524b54480418b4c4717c4a0f0a8669939c (diff) | |
| parent | ca97f8b9bab80844be613a9253643b7da8e738c7 (diff) | |
Merge branch '7.8'
Conflicts:
src/gallium/drivers/cell/ppu/cell_screen.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/shading.html | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/docs/shading.html b/docs/shading.html index bd02335a803..750884cf36c 100644 --- a/docs/shading.html +++ b/docs/shading.html @@ -15,10 +15,6 @@ OpenGL Shading Language</a>. </p> <p> -Last updated on 15 December 2008. -</p> - -<p> Contents </p> <ul> |