projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 823aac3 158a5f7)
Merge commit 'origin/gallium-0.1' into gallium-0.2
authorAlan Hourihane <alanh@tungstengraphics.com>
Fri, 28 Nov 2008 16:18:36 +0000 (16:18 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Fri, 28 Nov 2008 16:18:36 +0000 (16:18 +0000)
Conflicts:

src/gallium/auxiliary/tgsi/tgsi_sse2.c

1  2 
src/mesa/state_tracker/st_cb_bitmap.c patch | diff1 | diff2 | blob | history

diff --cc src/mesa/state_tracker/st_cb_bitmap.c
Simple merge