git.libre-soc.org Git - mesa.git/commit

projects / mesa.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 060c7f2 94e1117)

author	Jakob Bornecrantz <jakob@vmware.com>
	Fri, 3 Jul 2009 16:53:58 +0000 (18:53 +0200)
committer	Jakob Bornecrantz <jakob@vmware.com>
	Fri, 3 Jul 2009 16:53:58 +0000 (18:53 +0200)
commit	862488075c5537b0613753b0d14c267527fc6199
tree	fd4d51272c86fbc88c12e2d16649547f3ca7b8df	tree
parent	060c7f2321f72503c14f9f3f7bb27d59d8a90224	commit \| diff
parent	94e1117c9ba259665cd8e790369dcd4c789a2f93	commit \| diff

Merge branch 'mesa_7_5_branch'

Conflicts:
src/mesa/main/dlist.c
src/mesa/vbo/vbo_save_api.c

14 files changed:

progs/tests/.gitignore	diff1 \|	diff2 \|	blob \| history
progs/tests/Makefile	diff1 \|	diff2 \|	blob \| history
progs/tests/SConscript	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_setup.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/intel/intel_fbo.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/dlist.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/enums.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/mtypes.h	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/arbprogparse.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_atom_framebuffer.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_program.c	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_exec_draw.c	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_save_api.c	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_split_copy.c	diff1 \|	diff2 \|	blob \| history