Keith Whitwell 9644fa6c48 Merge branch 'master' into gallium-0.2 ... Conflicts: include/GLES/egl.h include/GLES/egltypes.h src/egl/main/eglconfig.c src/egl/main/eglconfig.h src/glu/sgi/libnurbs/interface/bezierEval.h src/glu/sgi/libnurbs/interface/bezierPatch.h src/glu/sgi/libnurbs/interface/bezierPatchMesh.h src/glu/sgi/libnurbs/internals/dataTransform.h src/glu/sgi/libnurbs/internals/displaymode.h src/glu/sgi/libnurbs/internals/sorter.h src/glu/sgi/libnurbs/nurbtess/definitions.h src/glu/sgi/libnurbs/nurbtess/directedLine.h src/glu/sgi/libnurbs/nurbtess/gridWrap.h src/glu/sgi/libnurbs/nurbtess/monoChain.h src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h src/glu/sgi/libnurbs/nurbtess/partitionX.h src/glu/sgi/libnurbs/nurbtess/partitionY.h src/glu/sgi/libnurbs/nurbtess/polyDBG.h src/glu/sgi/libnurbs/nurbtess/polyUtil.h src/glu/sgi/libnurbs/nurbtess/primitiveStream.h src/glu/sgi/libnurbs/nurbtess/quicksort.h src/glu/sgi/libnurbs/nurbtess/rectBlock.h src/glu/sgi/libnurbs/nurbtess/sampleComp.h src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h src/glu/sgi/libnurbs/nurbtess/sampledLine.h src/glu/sgi/libnurbs/nurbtess/searchTree.h src/glu/sgi/libnurbs/nurbtess/zlassert.h src/glu/sgi/libutil/error.c src/glu/sgi/libutil/glue.c src/glu/sgi/libutil/gluint.h src/glu/sgi/libutil/project.c src/glu/sgi/libutil/registry.c src/glx/x11/Makefile src/glx/x11/glxclient.h src/glx/x11/glxext.c src/mesa/drivers/dri/ffb/ffb_dd.h src/mesa/drivers/dri/ffb/ffb_points.h src/mesa/drivers/dri/gamma/gamma_context.h src/mesa/drivers/dri/gamma/gamma_macros.h src/mesa/drivers/dri/i810/i810context.h src/mesa/drivers/dri/r128/r128_dd.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/tdfx/tdfx_dd.h src/mesa/drivers/x11/xm_buffer.c src/mesa/glapi/glapi.c src/mesa/main/dispatch.c src/mesa/main/state.c src/mesa/main/texstate.c src/mesa/shader/arbprogparse.c src/mesa/shader/arbprogram.c src/mesa/shader/nvfragparse.c src/mesa/shader/nvprogram.c src/mesa/shader/shader_api.c src/mesa/sources src/mesa/swrast/s_aaline.c src/mesa/swrast/s_aaline.h src/mesa/swrast/s_aatriangle.h src/mesa/swrast/s_accum.c src/mesa/swrast/s_alpha.h src/mesa/swrast/s_bitmap.c src/mesa/swrast/s_blend.h src/mesa/swrast/s_context.c src/mesa/swrast/s_copypix.c src/mesa/swrast/s_depth.c src/mesa/swrast/s_depth.h src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_drawpix.h src/mesa/swrast/s_feedback.c src/mesa/swrast/s_feedback.h src/mesa/swrast/s_fog.h src/mesa/swrast/s_lines.h src/mesa/swrast/s_logic.h src/mesa/swrast/s_masking.h src/mesa/swrast/s_points.c src/mesa/swrast/s_points.h src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast/s_span.h src/mesa/swrast/s_stencil.h src/mesa/swrast/s_texcombine.c src/mesa/swrast/s_texcombine.h src/mesa/swrast/s_texfilter.c src/mesa/swrast/s_texfilter.h src/mesa/swrast/s_texstore.c src/mesa/swrast/s_triangle.c src/mesa/swrast/s_triangle.h src/mesa/swrast/s_zoom.h src/mesa/swrast_setup/ss_context.c src/mesa/swrast_setup/ss_triangle.h src/mesa/tnl/t_draw.c src/mesa/tnl/t_vb_light.c src/mesa/tnl/t_vertex_generic.c src/mesa/tnl/t_vertex_sse.c src/mesa/tnl/t_vp_build.h src/mesa/tnl/tnl.h src/mesa/x86/common_x86.c		2008-09-21 10:28:06 -07:00
..
internal	Merge branch 'master' into gallium-0.2	2008-09-21 10:28:06 -07:00
amesa.h	Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.	2003-06-05 00:50:18 +00:00
directfbgl.h	DirectFB driver (Claudio Ciccani)	2005-01-03 15:35:00 +00:00
dmesa.h	DMesa now uses OSMesa as a back-end.	2006-03-31 20:53:12 +00:00
fxmesa.h	bump version numbers to their real values	2004-10-12 06:43:57 +00:00
ggimesa.h	Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.	2003-06-05 00:50:18 +00:00
gl.h	mesa: WinCE fixes	2008-07-16 16:11:38 -06:00
gl_mangle.h	regenerated	2007-06-29 07:53:11 -06:00
glext.h	version 41 of glext.h	2008-08-11 15:21:40 -06:00
glfbdev.h	Added initial multisampling support to glfbdev driver.	2006-08-10 10:21:17 +00:00
glu.h	Update to SGI FreeB 2.0.	2008-09-19 17:16:53 -04:00
glu_mangle.h	Add missing entry points. (Warren Cashen)	2003-10-10 22:09:05 +00:00
glut.h	more Mingw32 fixes	2007-07-27 11:19:35 -06:00
glut_h.dja	Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.	2003-06-05 00:50:18 +00:00
glutf90.h	Add glut_fcb.c to the build and update to fix warnings (see bug 12405)	2007-09-12 13:40:15 -06:00
glx.h	updated GLX_EXT_texture_from_pixmap tokens (Dave Reveman)	2006-05-05 18:19:54 +00:00
glx_mangle.h	added 1.3/1.4 function mangling	2006-11-03 18:29:39 +00:00
glxext.h	version 20 of glxext.h	2008-08-11 15:21:40 -06:00
Makefile.am	* common_rules.make: Created to hold the conditional build rule	2001-03-20 00:33:18 +00:00
mesa_wgl.h	more Mingw32 fixes	2007-07-27 11:19:35 -06:00
mglmesa.h	Convert crlf->lf line endings.	2008-02-28 16:34:32 +09:00
miniglx.h	add more functionality to miniglx for glitz	2005-02-20 10:46:34 +00:00
osmesa.h	bump version number	2005-12-08 14:51:36 +00:00
svgamesa.h	Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.	2003-06-05 00:50:18 +00:00
uglglutshapes.h	WindML driver (Stephane Raimbault)	2001-08-20 16:07:10 +00:00
uglmesa.h	bump versions to 4.0	2001-09-23 16:06:13 +00:00
vms_x_fix.h	OpenVMS compile support update	2006-09-04 06:26:08 +00:00
wmesa.h	Assorted Windows fixes (Karl Schultz)	2008-05-29 10:42:02 -06:00
xmesa.h	Fix xserver build after recent XMesa changes.	2007-05-22 13:56:30 +02:00
xmesa_x.h	Fix xserver build after recent XMesa changes.	2007-05-22 13:56:30 +02:00
xmesa_xf86.h	Fix GLX build of xserver master branch.	2007-11-05 10:03:26 +01:00