projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1a39872 f8f9580)
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Mon, 10 Dec 2007 01:06:59 +0000 (12:06 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Mon, 10 Dec 2007 01:06:59 +0000 (12:06 +1100)
commit5c1a5b504705214fd5e90b33bb3034e75f6b5994
treeac6e3bd4cb94979ad1fce57a3fd01249253ef3aetree
parent1a3987240a547ba6e625c864f10a033858de4c65commit | diff
parentf8f9580a2a1c89af1dc0e169b62440053d9d7e81commit | diff
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

Conflicts:

src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
src/mesa/pipe/Makefile
src/mesa/pipe/draw/draw_vertex_fetch.c
src/mesa/pipe/i915simple/i915_texture.c
src/mesa/pipe/softpipe/sp_texture.c
src/mesa/pipe/xlib/xm_winsys.c
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/pipe/Makefile diff1 | diff2 | blob | history