mesa.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote branch 'upstream/mesa_7_7_branch' into debian-experimental	Julien Cristau	2009-12-25	63	-300/+287
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: progs/tests/bug_texstore_i8.c progs/tests/crossbar.c progs/tests/cva.c progs/tests/fptest1.c progs/tests/invert.c progs/tests/packedpixels.c progs/tests/quads.c progs/tests/scissor-viewport.c progs/tests/scissor.c progs/tests/stencilwrap.c progs/tests/tex1d.c progs/tests/unfilledclip.c progs/tests/vpeval.c progs/trivial/clear-fbo-tex.c progs/trivial/createwin.c progs/trivial/dlist-begin-call-end.c progs/trivial/draw2arrays.c progs/trivial/drawarrays.c progs/trivial/tri-blend-max.c progs/trivial/tri-blend-min.c progs/trivial/tri-blend-revsub.c progs/trivial/tri-blend-sub.c progs/trivial/tri-blend.c progs/trivial/tri-fbo-tex.c progs/trivial/tri-fp.c progs/trivial/tri-logicop-none.c progs/trivial/tri-logicop-xor.c progs/trivial/tri-z.c progs/trivial/vbo-drawarrays.c progs/trivial/vbo-noninterleaved.c src/glut/glx/glut_menu.c
\| *	progs/redbook: Silence compiler warnings.	Vinson Lee	2009-12-21	62	-296/+283
\| \|
\| *	progs/redbook: Silence compiler warnings in aaindex.c.	Vinson Lee	2009-12-12	1	-4/+4
\| \|
* \|	Merge branch 'mesa_7_6_branch' of git://anongit.freedesktop.org/mesa/mesa ↵	Brice Goglin	2009-12-05	1	-0/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into debian-unstable Conflicts: progs/fp/Makefile progs/fp/fp-tri.c progs/fp/point-position.c progs/fp/tri-depth.c progs/fp/tri-depth2.c progs/fp/tri-depthwrite.c progs/fp/tri-depthwrite2.c progs/fp/tri-inv.c progs/fp/tri-param.c progs/fp/tri-tex.c progs/tests/Makefile progs/tests/SConscript progs/tests/arraytexture.c progs/tests/copypixrate.c progs/tests/crossbar.c progs/tests/drawbuffers.c progs/tests/invert.c progs/tests/minmag.c progs/tests/mipmap_comp.c progs/tests/prog_parameter.c progs/tests/random.c progs/tests/shader_api.c progs/tests/stencil_twoside.c progs/tests/texcmp.c progs/tests/texdown.c progs/tests/vao-01.c progs/tests/vao-02.c progs/trivial/clear-fbo-tex.c progs/trivial/clear-fbo.c progs/trivial/clear-random.c progs/trivial/clear-scissor.c progs/trivial/clear.c progs/trivial/createwin.c progs/trivial/dlist-begin-call-end.c progs/trivial/dlist-dangling.c progs/trivial/dlist-edgeflag-dangling.c progs/trivial/dlist-edgeflag.c progs/trivial/dlist-flat-tri.c progs/trivial/dlist-mat-tri.c progs/trivial/dlist-recursive-call.c progs/trivial/dlist-tri-flat-tri.c progs/trivial/dlist-tri-mat-tri.c progs/trivial/line-clip.c progs/trivial/line-cull.c progs/trivial/line-flat.c progs/trivial/line-stipple-wide.c progs/trivial/line-userclip-clip.c progs/trivial/line-userclip-nop-clip.c progs/trivial/line-userclip-nop.c progs/trivial/line-userclip.c progs/trivial/line-wide.c progs/trivial/line.c progs/trivial/lineloop-clip.c progs/trivial/lineloop.c progs/trivial/linestrip-clip.c progs/trivial/linestrip-flat-stipple.c progs/trivial/linestrip-stipple-wide.c progs/trivial/linestrip-stipple.c progs/trivial/linestrip.c progs/trivial/point-clip.c progs/trivial/point-param.c progs/trivial/point-sprite.c progs/trivial/point-wide-smooth.c progs/trivial/point-wide.c progs/trivial/point.c progs/trivial/poly-flat-clip.c progs/trivial/poly-flat-unfilled-clip.c progs/trivial/poly-flat.c progs/trivial/poly-unfilled.c progs/trivial/poly.c progs/trivial/quad-clip-all-vertices.c progs/trivial/quad-clip.c progs/trivial/quad-degenerate.c progs/trivial/quad-flat.c progs/trivial/quad-offset-factor.c progs/trivial/quad-offset-unfilled.c progs/trivial/quad-offset-units.c progs/trivial/quad-tex-alpha.c progs/trivial/quad-tex-pbo.c progs/trivial/quad-unfilled-clip.c progs/trivial/quad-unfilled-stipple.c progs/trivial/quad-unfilled.c progs/trivial/quad.c progs/trivial/quads.c progs/trivial/quadstrip-cont.c progs/trivial/quadstrip-flat.c progs/trivial/quadstrip.c progs/trivial/readpixels.c progs/trivial/tri-alpha-tex.c progs/trivial/tri-alpha.c progs/trivial/tri-blend-color.c progs/trivial/tri-clear.c progs/trivial/tri-clip.c progs/trivial/tri-cull-both.c progs/trivial/tri-dlist.c progs/trivial/tri-fbo.c progs/trivial/tri-flat-clip.c progs/trivial/tri-flat.c progs/trivial/tri-fog.c progs/trivial/tri-fp-const-imm.c progs/trivial/tri-fp.c progs/trivial/tri-lit-material.c progs/trivial/tri-lit.c progs/trivial/tri-multitex-vbo.c progs/trivial/tri-orig.c progs/trivial/tri-query.c progs/trivial/tri-scissor-tri.c progs/trivial/tri-square.c progs/trivial/tri-stipple.c progs/trivial/tri-tex-3d.c progs/trivial/tri-tex.c progs/trivial/tri-tri.c progs/trivial/tri-unfilled-clip.c progs/trivial/tri-unfilled-edgeflag.c progs/trivial/tri-unfilled-point.c progs/trivial/tri-unfilled-smooth.c progs/trivial/tri-unfilled-tri-lit.c progs/trivial/tri-unfilled-tri.c progs/trivial/tri-unfilled-userclip-stip.c progs/trivial/tri-unfilled-userclip.c progs/trivial/tri-unfilled.c progs/trivial/tri-userclip.c progs/trivial/tri-z-9.c progs/trivial/tri-z-eq.c progs/trivial/trifan-flat-clip.c progs/trivial/trifan-flat-unfilled-clip.c progs/trivial/trifan-flat.c progs/trivial/trifan-unfilled.c progs/trivial/trifan.c progs/trivial/tristrip-clip.c progs/trivial/tristrip-flat.c progs/trivial/tristrip.c progs/trivial/vp-tri-cb-pos.c progs/trivial/vp-tri-cb-tex.c progs/trivial/vp-tri-invariant.c progs/vp/vp-tris.c progs/vpglsl/psiz-mul.glsl progs/vpglsl/vp-tris.c
\| *	progs/redbook: Fix memory leak in quadric.c.	Vinson Lee	2009-12-03	1	-0/+2
\| \| \| \| \| \| \| \|	(cherry picked from commit 47b5f584a68ceab7c9c1d5279efbc9fe30ff2fcc)
* \|	Merge branch 'debian-experimental' into test	Timo Aaltonen	2009-05-18	3	-205/+0
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Makefile configs/default docs/download.html docs/news.html docs/relnotes-7.4.2.html doxygen/.gitignore include/GL/internal/dri_interface.h include/GLES/egl.h progs/demos/Windows/all.dsp progs/demos/Windows/bounce.dsp progs/demos/Windows/clearspd.dsp progs/demos/Windows/cubemap.dsp progs/demos/Windows/demos.dsw progs/demos/Windows/drawpix.dsp progs/demos/Windows/fire.dsp progs/demos/Windows/gears.dsp progs/demos/Windows/geartrain.dsp progs/demos/Windows/glinfo.dsp progs/demos/Windows/gloss.dsp progs/demos/Windows/gltestperf.dsp progs/demos/Windows/glutfx.dsp progs/demos/Windows/ipers.dsp progs/demos/Windows/isosurf.dsp progs/demos/Windows/loadbias.dsp progs/demos/Windows/morph3d.dsp progs/demos/Windows/multiarb.dsp progs/demos/Windows/occlude.dsp progs/demos/Windows/osdemo.dsp progs/demos/Windows/paltex.dsp progs/demos/Windows/pixeltex.dsp progs/demos/Windows/pointblast.dsp progs/demos/Windows/rain.dsp progs/demos/Windows/ray.dsp progs/demos/Windows/readpix.dsp progs/demos/Windows/reflect.dsp progs/demos/Windows/renormal.dsp progs/demos/Windows/shadowtex.dsp progs/demos/Windows/spectex.dsp progs/demos/Windows/spriteblast.dsp progs/demos/Windows/stex3d.dsp progs/demos/Windows/teapot.dsp progs/demos/Windows/terrain.dsp progs/demos/Windows/tessdemo.dsp progs/demos/Windows/texcyl.dsp progs/demos/Windows/texdown.dsp progs/demos/Windows/texenv.dsp progs/demos/Windows/texobj.dsp progs/demos/Windows/trispd.dsp progs/demos/Windows/tunnel.dsp progs/demos/Windows/tunnel2.dsp progs/demos/Windows/winpos.dsp progs/demos/dinoshade.c progs/demos/projtex.c progs/egl/Makefile progs/egl/demo1.c progs/egl/demo2.c progs/egl/demo3.c progs/egl/eglgears.c progs/egl/eglinfo.c progs/fp/.gitignore progs/fp/Makefile progs/miniglx/Makefile progs/redbook/Windows/redbook.dsw progs/redbook/Windows/teapots.dsp progs/slang/windows/vc60/cltest.dsp progs/slang/windows/vc60/framework.dsp progs/slang/windows/vc60/slang.dsw progs/slang/windows/vc60/sotest.dsp progs/slang/windows/vc60/vstest.dsp progs/tests/.gitignore progs/tests/Makefile progs/tests/afsmultiarb.c progs/tests/antialias.c progs/tests/api_speed.c progs/tests/arbfpspec.c progs/tests/arbfptest1.c progs/tests/arbfptexture.c progs/tests/arbfptrig.c progs/tests/arbnpot-mipmap.c progs/tests/arbnpot.c progs/tests/arbvptest1.c progs/tests/arbvptest3.c progs/tests/arbvptorus.c progs/tests/arbvpwarpmesh.c progs/tests/arraytexture.c progs/tests/blendminmax.c progs/tests/blendsquare.c progs/tests/blendxor.c progs/tests/bufferobj.c progs/tests/bug_3050.c progs/tests/bug_3101.c progs/tests/bug_3195.c progs/tests/copypixrate.c progs/tests/crossbar.c progs/tests/cva.c progs/tests/debugger.c progs/tests/drawbuffers.c progs/tests/exactrast.c progs/tests/ext422square.c progs/tests/fbotest1.c progs/tests/fbotest2.c progs/tests/floattex.c progs/tests/fog.c progs/tests/fogcoord.c progs/tests/fptest1.c progs/tests/fptexture.c progs/tests/interleave.c progs/tests/invert.c progs/tests/jkrahntest.c progs/tests/lineclip.c progs/tests/manytex.c progs/tests/minmag.c progs/tests/mipmap_limits.c progs/tests/multipal.c progs/tests/multitexarray.c progs/tests/multiwindow.c progs/tests/no_s3tc.c progs/tests/packedpixels.c progs/tests/pbo.c progs/tests/prog_parameter.c progs/tests/random.c progs/tests/readrate.c progs/tests/rubberband.c progs/tests/seccolor.c progs/tests/shader_api.c progs/tests/stencil_twoside.c progs/tests/stencil_wrap.c progs/tests/stencilwrap.c progs/tests/subtexrate.c progs/tests/tex1d.c progs/tests/texcmp.c progs/tests/texcompress2.c progs/tests/texfilt.c progs/tests/texgenmix.c progs/tests/texline.c progs/tests/texrect.c progs/tests/texwrap.c progs/tests/unfilledclip.c progs/tests/vao-01.c progs/tests/vao-02.c progs/tests/vparray.c progs/tests/vpeval.c progs/tests/vptest1.c progs/tests/vptest2.c progs/tests/vptest3.c progs/tests/vptorus.c progs/tests/vpwarpmesh.c progs/tests/yuvrect.c progs/tests/yuvsquare.c progs/tests/zreaddraw.c progs/trivial/.gitignore progs/trivial/Makefile progs/trivial/clear.c progs/trivial/dlist-dangling.c progs/trivial/dlist-edgeflag-dangling.c progs/trivial/dlist-edgeflag.c progs/trivial/drawarrays.c progs/trivial/drawelements.c progs/trivial/drawrange.c progs/trivial/line-clip.c progs/trivial/line-cull.c progs/trivial/line-userclip-clip.c progs/trivial/line-userclip-nop-clip.c progs/trivial/line-userclip-nop.c progs/trivial/line-userclip.c progs/trivial/line.c progs/trivial/lineloop-clip.c progs/trivial/lineloop.c progs/trivial/point-clip.c progs/trivial/point-param.c progs/trivial/point-wide.c progs/trivial/point.c progs/trivial/poly-flat.c progs/trivial/poly-unfilled.c progs/trivial/poly.c progs/trivial/quad-clip-all-vertices.c progs/trivial/quad-clip-nearplane.c progs/trivial/quad-clip.c progs/trivial/quad-degenerate.c progs/trivial/quad-flat.c progs/trivial/quad-offset-factor.c progs/trivial/quad-offset-unfilled.c progs/trivial/quad-offset-units.c progs/trivial/quad-tex-2d.c progs/trivial/quad-tex-3d.c progs/trivial/quad-tex-pbo.c progs/trivial/quad-unfilled.c progs/trivial/quad.c progs/trivial/quads.c progs/trivial/quadstrip-flat.c progs/trivial/quadstrip.c progs/trivial/tri-blend.c progs/trivial/tri-clip.c progs/trivial/tri-cull.c progs/trivial/tri-dlist.c progs/trivial/tri-edgeflag.c progs/trivial/tri-flat-clip.c progs/trivial/tri-flat.c progs/trivial/tri-tex-3d.c progs/trivial/tri-unfilled-clip.c progs/trivial/tri-unfilled-smooth.c progs/trivial/tri-unfilled-userclip.c progs/trivial/tri-unfilled.c progs/trivial/tri-userclip.c progs/trivial/tri.c progs/trivial/tristrip-clip.c progs/trivial/tristrip.c progs/trivial/vbo-drawarrays.c progs/trivial/vbo-drawelements.c progs/trivial/vbo-drawrange.c progs/trivial/vp-array.c progs/trivial/vp-clip.c progs/trivial/vp-line-clip.c progs/trivial/vp-tri.c progs/trivial/vp-unfilled.c progs/vp/Makefile progs/vp/vp-tris.c src/egl/Makefile src/egl/drivers/demo/Makefile src/egl/drivers/demo/demo.c src/egl/drivers/dri/Makefile src/egl/drivers/dri/egldri.c src/egl/drivers/dri/egldri.h src/egl/main/Makefile src/egl/main/eglapi.c src/egl/main/eglapi.h src/egl/main/eglconfig.c src/egl/main/eglconfig.h src/egl/main/eglcontext.c src/egl/main/eglcontext.h src/egl/main/egldisplay.c src/egl/main/egldisplay.h src/egl/main/egldriver.c src/egl/main/egldriver.h src/egl/main/eglglobals.c src/egl/main/eglglobals.h src/egl/main/egllog.c src/egl/main/eglmode.h src/egl/main/eglsurface.c src/egl/main/eglsurface.h src/egl/main/egltypedefs.h src/glx/mini/Makefile src/glx/x11/dri2_glx.c src/mesa/drivers/allegro/amesa.c src/mesa/drivers/dri/intel/intel_buffers.c src/mesa/drivers/dri/intel/intel_clear.c src/mesa/drivers/dri/intel/intel_context.c src/mesa/drivers/dri/intel/intel_pixel.c src/mesa/drivers/dri/r300/r300_texstate.c src/mesa/drivers/dri/radeon/radeon_screen.c src/mesa/drivers/windows/gldirect/dx7/gld_wgl_dx7.c src/mesa/drivers/windows/gldirect/dx8/gld_wgl_dx8.c src/mesa/drivers/windows/gldirect/dx9/gld_wgl_dx9.c src/mesa/main/glheader.h src/mesa/main/light.c src/mesa/main/teximage.c src/mesa/main/texparam.c src/mesa/main/version.h src/mesa/swrast/s_texfilter.c
\| *	Merge tag 'mesa_7_0_2' into debian-unstable	Brice Goglin	2007-11-11	1	-1/+3
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore progs/demos/.gitignore progs/directfb/Makefile progs/egl/Makefile progs/fbdev/Makefile progs/fp/Makefile progs/miniglx/Makefile progs/samples/.gitignore progs/slang/Makefile progs/tests/.gitignore progs/tests/Makefile progs/tools/trace/Makefile progs/trivial/Makefile progs/vp/Makefile progs/xdemos/.gitignore src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/mesa/Makefile src/glut/directfb/Makefile src/glx/mini/Makefile
\| \| *	specify app lib dependencies in Makefiles (patch 1/3)	Dan Nicholson	2007-10-29	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry-picked from commit c05aa5ec4cc29f949eff350582cb6f6c03dce3c6) Conflicts: progs/demos/Makefile progs/xdemos/Makefile
\| \| *	add support for LDFLAGS env var	Dan Nicholson	2007-09-28	1	-1/+1
\| \| \|
\| * \|	Delete .gitignore files which do more harm than good in a debian package tree.	Julien Cristau	2007-04-22	1	-64/+0
\| \| \|
\| * \|	Merge branch 'upstream-experimental' into debian-experimental	Julien Cristau	2007-04-22	1	-221/+0
\| \|\\|
\| * \|	Merge branch 'upstream-experimental' into debian-experimental	Julien Cristau	2007-04-21	1	-0/+0
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doxygen/Makefile doxygen/common.doxy doxygen/doxy.bat doxygen/glapi.doxy doxygen/header.html doxygen/main.doxy doxygen/math.doxy doxygen/shader.doxy doxygen/swrast.doxy doxygen/swrast_setup.doxy doxygen/tnl.doxy doxygen/tnl_dd.doxy progs/tests/Makefile progs/tests/fbotest1.c progs/tests/fbotest2.c progs/tests/fbotexture.c progs/tests/mipmap_limits.c progs/tests/sharedtex.c progs/tools/trace/gltrace_support.cc progs/trivial/Makefile src/egl/docs/EGL_MESA_screen_surface src/egl/main/egllog.c src/glx/mini/Makefile src/glx/mini/driver.h src/mesa/drivers/allegro/amesa.c src/mesa/drivers/windows/gldirect/dx7/gld_driver_dx7.c src/mesa/drivers/windows/gldirect/dx7/gld_ext_dx7.c src/mesa/drivers/windows/gldirect/dx7/gld_primitive_dx7.c src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c src/mesa/drivers/windows/gldirect/dx8/gld_ext_dx8.c src/mesa/drivers/windows/gldirect/dx8/gld_primitive_dx8.c src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c src/mesa/drivers/windows/gldirect/dx9/gld_ext_dx9.c src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
\| * \| \|	Delete directories not included in the mesa tarballs.	Julien Cristau	2007-02-04	2	-141/+0
\| \| \| \|
* \| \| \|	progs: add fflushes for cygwin	Keith Whitwell	2009-04-28	1	-0/+3
\| \| \| \|
* \| \| \|	progs: Build rebook with scons too.	José Fonseca	2009-02-10	1	-0/+91
\| \| \| \|
* \| \| \|	Merge commit 'origin/gallium-0.1' into gallium-0.2	Keith Whitwell	2008-09-11	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Makefile progs/demos/Makefile progs/glsl/Makefile progs/redbook/Makefile progs/samples/Makefile progs/tests/Makefile progs/trivial/Makefile progs/xdemos/Makefile src/gallium/Makefile src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/vbo/vbo_exec_draw.c
\| * \| \| \|	define new APP_CC configuration variable for building apps/demos/tests	Brian Paul	2008-09-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For Cell, need to use different compilers for the libraries vs. the demos/tests to avoid strange link error regarding "_Unwind_GetIPInfo@GCC_4.2.0"
* \| \| \| \|	Merge branch 'gallium-0.1' into gallium-0.2	Keith Whitwell	2008-09-11	2	-141/+141
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
\| * \| \| \|	Fix CRLF line endings.	José Fonseca	2008-06-24	2	-141/+141
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	specify app lib dependencies in Makefiles (patch 1/3)	Dan Nicholson	2007-10-29	1	-1/+3
\| \| \| \|
* \| \| \|	add support for LDFLAGS env var	Dan Nicholson	2007-09-28	1	-1/+1
\|/ / /
* \| /	Remove unused Imakefiles.	Brian	2007-04-20	1	-221/+0
\| \|/ \|/\|
* \|	Make git ignore files only generated at build time.	Michel Dänzer	2006-12-06	1	-0/+0
\|/
*	LIB_DIR is now just 'lib' or 'lib64'	Brian Paul	2006-07-13	1	-1/+1
\| \| \| \| \|	Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets. Patch by Hanno BÃ¶ck.
*	fix some weirdness accidentally checked in in the past	Brian Paul	2005-01-17	1	-2/+2
\|
*	animation rate patch (Marcello Magallon)	Brian Paul	2005-01-09	2	-5/+28
\|
*	Redraw on keypress, as apparently intended.	Keith Whitwell	2005-01-06	1	-1/+1
\|
*	Obsolete the BeOS-specific makefile as we now build using standard Makefiles ↵	Philippe Houdoin	2004-08-14	1	-59/+0
\| \| \| \|	chain.
*	obsolete	Brian Paul	2004-04-22	1	-50/+0
\|
*	minor fixes	Brian Paul	2004-03-26	1	-1/+1
\|
*	Tweaks for make clean / realclean.	Brian Paul	2004-03-26	1	-3/+1
\|
*	New Makefile system	Brian Paul	2004-03-26	1	-0/+41
\|
*	improved 'clean' targets (Otto Solares)	Brian Paul	2003-10-03	1	-3/+3
\|
*	MS dev studio project file for teapots demo.	Karl Schultz	2003-09-24	1	-0/+112
\|
*	Workspace file for redbook programs	Karl Schultz	2003-09-24	1	-0/+29
\|
*	Change projection transform so that the top row of teapots are now visible.	Karl Schultz	2003-09-24	1	-2/+2
\|
*	files for CVS to ignore	Brian Paul	2003-09-05	1	-0/+64
\|
*	updated old-style makefiles for new tree	Brian Paul	2003-06-10	1	-1/+1
\|
*	Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.	Ian Romanick	2003-06-05	1	-14/+0
\|
*	Remove a bunch of really old/obsolete configs.	Brian Paul	2003-06-01	1	-20/+6
\| \| \| \|	Use the new mklib script.
*	casts	Brian Paul	2003-04-21	3	-3/+3
\|
*	Quiet compiler warnings.	Karl Schultz	2002-10-18	3	-6/+6
\|
*	added missing glFinish()	Brian Paul	2002-10-15	1	-0/+2
\|
*	Pedantic compiler fixes (Sven Panne)	Brian Paul	2002-07-12	1	-1/+1
\|
*	undo some debug changes mistakenly checked in earlier	Brian Paul	2002-02-17	1	-2/+1
\|
*	silence compiler warnings	Brian Paul	2002-02-12	5	-3/+8
\|
*	Removed missing files and added new ones (Robert Bergkvist)	Karl Schultz	2002-01-16	1	-27/+24
\|
*	patched to silence compiler warnings (Martin Lindhe)	Brian Paul	2000-11-10	2	-2/+2
\|
*	added comment explaining why the demo is flawed	Brian Paul	2000-10-31	1	-2/+19
\|
*	Re-enable the keyboard functionality.	Keith Whitwell	2000-06-14	1	-13/+94
\| \| \| \| \|	Add a -db option for doublebuffering. Add a 'benchmark' keystroke like isosurf.