projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b71472 c303e72)
Merge commit 'origin/master' into gallium-0.2
authorAlan Hourihane <alanh@tungstengraphics.com>
Fri, 28 Nov 2008 16:19:10 +0000 (16:19 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Fri, 28 Nov 2008 16:19:10 +0000 (16:19 +0000)
1  2 
src/glx/x11/glxclient.h patch | diff1 | diff2 | blob | history
src/mesa/shader/prog_statevars.c patch | diff1 | diff2 | blob | history

diff --cc src/glx/x11/glxclient.h
Simple merge
diff --cc src/mesa/shader/prog_statevars.c
Simple merge