diff options
| author | Nicolai Haehnle <nhaehnle@gmail.com> | 2008-09-28 18:28:05 +0200 |
|---|---|---|
| committer | Nicolai Haehnle <nhaehnle@gmail.com> | 2008-09-28 18:47:13 +0200 |
| commit | 3dba9178ec5dbf8183a5ceee701c9a36606ad464 (patch) | |
| tree | 51276417f55673bb44810780d222516c84672a3e /docs/RELNOTES-5.0.1 | |
| parent | 857362ef14fc4f175a9d425a74f9ca2b691971d6 (diff) | |
| parent | 2e5d717007ba6515b094b9af8ed869130185a308 (diff) | |
Merge branch 'master' into develop
Conflicts:
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/r300/radeon_context.c
src/mesa/drivers/dri/r300/radeon_context.h
Diffstat (limited to 'docs/RELNOTES-5.0.1')
| -rw-r--r-- | docs/RELNOTES-5.0.1 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/RELNOTES-5.0.1 b/docs/RELNOTES-5.0.1 index 8d72cc44c1..f37e9c4a7f 100644 --- a/docs/RELNOTES-5.0.1 +++ b/docs/RELNOTES-5.0.1 @@ -43,4 +43,3 @@ driver call the _mesa_enable_1_4_extensions() function. ---------------------------------------------------------------------- -$Id: RELNOTES-5.0.1,v 3.1 2003/03/30 16:17:54 brianp Exp $ |