projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1fa023a 0e8a5a8)
Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Mon, 1 Jun 2009 21:01:33 +0000 (15:01 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 1 Jun 2009 21:01:33 +0000 (15:01 -0600)
1  2 
src/mesa/main/context.c patch | diff1 | diff2 | blob | history
src/mesa/state_tracker/st_public.h patch | diff1 | diff2 | blob | history

diff --cc src/mesa/main/context.c
Simple merge
diff --cc src/mesa/state_tracker/st_public.h
Simple merge