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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'upstream-experimental' into debian-experimental	Brice Goglin	2010-01-11	6	-14/+49
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: progs/egl/eglgears.c progs/egl/eglscreen.c progs/fp/Makefile progs/fp/SConscript progs/rbug/simple_server.c progs/tests/getprocaddress.c progs/tests/interleave.c progs/tests/texwrap.c progs/tests/vparray.c progs/vp/vp-tris.c src/glut/glx/win32_menu.c
\| *	progs/demos: Remove unnecessary header from fbotexture.c.	Vinson Lee	2010-01-11	1	-1/+0
\| \|
\| *	progs/demos: Bounds check input to fire.c.	Vinson Lee	2010-01-10	1	-1/+7
\| \|
\| *	progs/demos: Add missing initializers in engine.c.	Vinson Lee	2010-01-08	1	-3/+15
\| \|
\| *	progs/demos: Assert that input to malloc is valid.	Vinson Lee	2010-01-06	1	-0/+2
\| \|
\| *	Merge branch 'mesa_7_6_branch' into mesa_7_7_branch	Brian Paul	2009-12-27	3	-9/+25
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gallium/auxiliary/util/u_network.c src/gallium/auxiliary/util/u_network.h src/gallium/drivers/i915/i915_state.c src/gallium/drivers/trace/tr_rbug.c src/gallium/state_trackers/vega/bezier.c src/gallium/state_trackers/vega/vg_context.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_driver.c src/gallium/winsys/xlib/xlib_brw_context.c src/mesa/main/mtypes.h
\| \| *	progs/demos: Silence warn_unused_result warnings.	Vinson Lee	2009-12-26	3	-9/+25
\| \| \|
* \| \|	Merge remote branch 'upstream/mesa_7_7_branch' into debian-experimental	Julien Cristau	2009-12-25	2	-5/+6
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Merge branch 'mesa_7_6_branch' into mesa_7_7_branch	Brian Paul	2009-12-21	1	-1/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac progs/demos/morph3d.c progs/demos/textures.c progs/glsl/shtest.c progs/glsl/texaaline.c progs/tests/packedpixels.c progs/xdemos/corender.c src/mesa/main/version.h
\| \| *	progs/demos: Silence compiler warning in morph3d.c.	Vinson Lee	2009-12-18	1	-1/+1
\| \| \|
\| \| *	progs/demos: Use C-style comment.	Vinson Lee	2009-12-18	1	-1/+1
\| \| \|
\| * \|	progs/demos: report pixel rate in million pixels / sec	Brian Paul	2009-12-21	1	-4/+5
\| \| \|
* \| \|	Merge branch 'upstream-experimental' into debian-experimental	Brice Goglin	2009-12-12	7	-10/+94
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doxygen/gallium.doc progs/egl/demo1.c progs/egl/demo2.c progs/egl/demo3.c progs/egl/eglgears.c progs/egl/eglinfo.c progs/slang/cltest.c progs/slang/vstest.c progs/tests/arbgpuprog.c progs/tests/getprocaddress.c progs/tests/getteximage.c progs/tests/mipmap_limits.c progs/tests/packedpixels.c progs/tests/sharedtex.c progs/tests/texcmp.c progs/tests/texcomp_image.h progs/tests/texcompsub.c progs/tests/zreaddraw.c scons/crossmingw.py scons/dxsdk.py scons/gallium.py scons/generic.py scons/llvm.py scons/winddk.py src/gallium/state_trackers/xorg/xvmc/tests/.gitignore src/gallium/state_trackers/xorg/xvmc/tests/test_context.c src/gallium/state_trackers/xorg/xvmc/tests/test_rendering.c src/gallium/state_trackers/xorg/xvmc/tests/testlib.c src/gallium/state_trackers/xorg/xvmc/tests/xvmc_bench.c src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c windows/VC7/mesa/mesa/mesa.vcproj
\| * \|	Merge branch 'mesa_7_6_branch' into mesa_7_7_branch	Ian Romanick	2009-12-07	1	-0/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: progs/demos/projtex.c progs/xdemos/glxinfo.c src/mesa/main/version.h To fix the confilicts in projtex.c and glxinfo.c I just took the code from mesa_7_6_branch. The conflicts seem to have occured from cherry-picks from mesa_7_7_branch to mesa_7_6_branch followed by commmits just to mesa_7_6_branch.
\| * \|	Merge commit 'mesa_7_6_branch' into mesa_7_7_branch	Jakob Bornecrantz	2009-12-02	1	-2/+0
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/mesa/main/version.h
\| * \| \|	progs/demos: silence warnings	Brian Paul	2009-11-17	2	-2/+3
\| \| \| \|
\| * \| \|	progs/demos: Fix memory leak in ray.c.	Vinson Lee	2009-11-16	1	-0/+2
\| \| \| \|
\| * \| \|	progs/demos: Fix memory leak in projtex.c.	Vinson Lee	2009-11-16	1	-0/+3
\| \| \| \|
\| * \| \|	progs/demos: Fix memory leak in ipers.c.	Vinson Lee	2009-11-16	1	-0/+2
\| \| \| \|
\| * \| \|	progs/demos: Fix memory leak in fslight.c.	Vinson Lee	2009-11-16	1	-0/+1
\| \| \| \|
\| * \| \|	progs/demos: add fps to multiarb	Keith Whitwell	2009-10-23	1	-0/+16
\| \| \| \|
\| * \| \|	progs/demos: try different depth formats in fbo_firecube.c	Brian Paul	2009-10-14	1	-8/+28
\| \| \| \|
\| * \| \|	Merge branch 'softpipe-opt'	Keith Whitwell	2009-09-23	1	-0/+16
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: progs/demos/cubemap.c src/gallium/drivers/softpipe/sp_tex_sample.c src/gallium/drivers/softpipe/sp_texture.c
\| \| * \| \|	progs/demos: add fps output to cubemap	Keith Whitwell	2009-08-23	1	-0/+16
\| \| \| \| \|
\| * \| \| \|	progs/demos: use non-default texobj in cubemap.c	Brian Paul	2009-09-15	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	progs/demos: create a texture object in lodbias.c	Brian Paul	2009-09-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before, we were using the default texture object (name=0). This caused the intel_generate_mipmap() path to fail since passing texture=0 to glFramebufferTexture2DEXT() causes us to _unbind_ the texture if present.
\| * \| \| \|	progs/demos: added RGB invert option	Brian Paul	2009-09-08	1	-0/+22
\| \| \| \| \|
* \| \| \| \|	Merge branch 'mesa_7_6_branch' of git://anongit.freedesktop.org/mesa/mesa ↵	Brice Goglin	2009-12-11	1	-0/+1
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into debian-unstable Conflicts: progs/tests/Makefile progs/tests/prog_parameter.c
\| * \| \| \|	progs/demos: Fix memory leak in projtex.c.	Vinson Lee	2009-12-07	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'mesa_7_6_branch' of git://anongit.freedesktop.org/mesa/mesa ↵	Brice Goglin	2009-12-05	5	-2/+8
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/demos: Fix memory leak in ray.c.	Vinson Lee	2009-12-03	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 6b480dc21dd489d48685b2268e495218aea74293)
\| * \| \| \|	progs/demos: Fix memory leak in projtex.c.	Vinson Lee	2009-12-03	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit ee555e3d69c8820f27e71e5ebc028a768cef7d0b)
\| * \| \| \|	progs/demos: Fix memory leak in ipers.c.	Vinson Lee	2009-12-03	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit a1afe303deda320aadacdaf5b1c72631ca3f734f)
\| * \| \| \|	progs/demos: Fix memory leak in fslight.c.	Vinson Lee	2009-12-03	1	-0/+1
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	(cherry picked from commit aef3218f0bb48fdb286d2008ee07e507ea8aa98e)
\| * \| \|	progs/demos: remove unused glFogCoordPointer_ext var	Brian Paul	2009-12-01	1	-2/+0
\| \|/ /
* \| \|	Merge tag 'mesa_7_6' into debian-unstable	Brice Goglin	2009-09-29	6	-20/+54
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: progs/egl/Makefile progs/egl/demo3.c progs/slang/vstest.c progs/tests/Makefile progs/tests/SConscript progs/tests/bufferobj.c progs/tests/floattex.c progs/tests/getprocaddress.c progs/tests/getprocaddress.py progs/tests/mapbufrange.c progs/tests/mapvbo.c progs/tests/texcmp.c progs/tests/texcompsub.c progs/tests/zreaddraw.c progs/trivial/.gitignore progs/vp/arl-static.txt progs/vp/arl-unused.txt progs/vp/vp-tris.c scons/gallium.py
\| * \|	mesa: gitignore	Younes Manton	2009-08-26	1	-0/+1
\| \| \|
\| * \|	Merge branch 'mesa_7_5_branch'	Brian Paul	2009-08-18	1	-4/+24
\| \|\ \
\| * \| \|	demos/cubemap: Add support for GL_ARB_seamless_cube_map	Ian Romanick	2009-08-14	1	-16/+38
\| \| \|/ \| \|/\|
\| * \|	demos: use glEnable/DisableClientState() for vertex arrays	Brian Paul	2009-07-08	1	-2/+2
\| \| \|
\| * \|	Merge branch 'mesa_7_5_branch'	Jakob Bornecrantz	2009-07-03	1	-5/+20
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.c
\| * \| \|	demos: Set the depth mask correctly to get the desired blending	Ian Romanick	2009-06-30	2	-4/+4
\| \| \| \|
\| * \| \|	Merge branch 'mesa_7_5_branch'	Brian Paul	2009-06-26	1	-2/+6
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Makefile src/gallium/drivers/softpipe/sp_screen.c src/mesa/main/version.h
\| * \| \| \|	demos: make cubemap work without EXT_fbo support	Roland Scheidegger	2009-06-20	1	-4/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use SGIS_generate_mipmap if EXT_fbo support (for manual mipmap generation) is not available.
\| * \| \| \|	Merge branch 'mesa_7_5_branch'	Thomas Hellstrom	2009-06-15	2	-38/+77
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: progs/util/extfuncs.h
\| * \| \| \| \|	demos: delete vertex array objects upon exit	Brian Paul	2009-05-07	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge tag 'mesa_7_5_1' into debian-unstable	Brice Goglin	2009-09-04	1	-4/+24
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: progs/tests/fbotest1.c progs/tests/texwrap.c progs/trivial/.gitignore progs/trivial/Makefile
\| * \| \| \| \|	progs/demos: print more info in fbotexture.c	Brian Paul	2009-08-14	1	-4/+24
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge tag 'mesa_7_5' into debian-experimental	Brice Goglin	2009-07-19	1	-5/+20
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: progs/tests/.gitignore progs/tests/Makefile progs/tests/SConscript progs/trivial/Makefile scons/dxsdk.py scons/gallium.py
\| * \| \| \|	progs/isosurf: add materials mode for glVertex + TRISTRIP	Keith Whitwell	2009-06-30	1	-5/+20
\| \| \|_\|/ \| \|/\| \|