projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f3e34ba 48156b8)
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video
authorChristian König <deathsimple@vodafone.de>
Tue, 12 Oct 2010 21:05:25 +0000 (23:05 +0200)
committerChristian König <deathsimple@vodafone.de>
Tue, 12 Oct 2010 21:07:29 +0000 (23:07 +0200)
commit695cc370a280a637f411f5ff3877b3fd1c05e424
tree69ae2a8fbecfa553faba59274688ffe11ee1a612tree
parentf3e34ba6fba76870b1c91a27adb706d1b87aeec8commit | diff
parent48156b87bc9d3e09ec34372d69504a787332ea0bcommit | diff
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video

Conflicts:
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/winsys/nouveau/drm/nouveau_drm_api.c
14 files changed:
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