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 /src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc | |
| 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 'src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc')
| -rw-r--r-- | src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc b/src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc index 2d54b155ee..26d05342f9 100644 --- a/src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc +++ b/src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc @@ -31,10 +31,8 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $ */ /* -** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc,v 1.1 2001/03/17 00:25:41 brianp Exp $ */ #include "gluos.h" |