projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83f4c44 ff54af5)
Merge branch '7.8'
authorBrian Paul <brianp@vmware.com>
Tue, 23 Mar 2010 15:14:17 +0000 (09:14 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 23 Mar 2010 15:14:17 +0000 (09:14 -0600)
Conflicts:

Makefile
src/gallium/state_trackers/glx/xlib/xm_api.c
src/mesa/drivers/dri/intel/intel_blit.c
src/mesa/drivers/dri/intel/intel_pixel_copy.c
src/mesa/main/version.h

1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge