projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 63b1525 bf21b70)
Merge branch 'master' into pipe-video
authorThomas Balling Sørensen <tball@tball-laptop.(none)>
Tue, 5 Oct 2010 10:04:08 +0000 (12:04 +0200)
committerThomas Balling Sørensen <tball@tball-laptop.(none)>
Tue, 5 Oct 2010 10:04:08 +0000 (12:04 +0200)
commit1218430e1200a08cd64b6555d3fd1fd0274ad9e5
treee060fb27b8388a4bd237ca39fc20f1675c5e367ctree
parent63b1525cf0a50e3d31328c3b56355a86056e4c05commit | diff
parentbf21b7006c63c3dc47045c22d4f372dfe6c7ce67commit | diff
Merge branch 'master' into pipe-video

Conflicts:
configs/linux-dri
configure.ac
src/gallium/drivers/nvfx/Makefile
src/gallium/include/pipe/p_defines.h
src/gallium/include/pipe/p_screen.h
src/gallium/include/state_tracker/dri1_api.h
src/gallium/include/state_tracker/drm_api.h
src/gallium/tests/python/samples/tri.py
src/gallium/tests/trivial/Makefile
src/gallium/tests/unit/Makefile
src/gallium/tests/unit/SConscript
src/gallium/tests/unit/u_format_test.c
src/gallium/winsys/nouveau/drm/nouveau_drm_api.c
16 files changed:
configs/autoconf.in diff1 | diff2 | blob | history
configs/linux-dri diff1 | diff2 | blob | history
configure.ac diff1 | diff2 | blob | history
src/gallium/auxiliary/Makefile diff1 | diff2 | blob | history
src/gallium/auxiliary/SConscript diff1 | diff2 | blob | history
src/gallium/drivers/nvfx/Makefile diff1 | diff2 | blob | history
src/gallium/drivers/nvfx/nvfx_screen.c diff1 | diff2 | blob | history
src/gallium/drivers/nvfx/nvfx_state.h diff1 | diff2 | blob | history
src/gallium/drivers/softpipe/Makefile diff1 | diff2 | blob | history
src/gallium/drivers/softpipe/SConscript diff1 | diff2 | blob | history
src/gallium/drivers/softpipe/sp_screen.c diff1 | diff2 | blob | history
src/gallium/include/pipe/p_defines.h diff1 | diff2 | blob | history
src/gallium/include/pipe/p_format.h diff1 | diff2 | blob | history
src/gallium/include/pipe/p_screen.h diff1 | diff2 | blob | history
src/gallium/targets/dri-nouveau/Makefile diff1 | diff2 | blob | history
src/gallium/winsys/g3dvl/dri/XF86dri.c diff1 | | blob | history