Thomas Balling Sørensen 1218430e12 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		2010-10-05 12:04:08 +02:00
..
pipe	Merge branch 'master' into pipe-video	2010-10-05 12:04:08 +02:00
state_tracker	dri: Pass the __DRIscreen and the __DRIscreen private back to image lookup	2010-09-22 22:02:05 -04:00