Merge branch 'origin'
authorEric Anholt <eric@anholt.net>
Mon, 29 Oct 2007 20:24:27 +0000 (13:24 -0700)
committerEric Anholt <eric@anholt.net>
Mon, 29 Oct 2007 20:24:27 +0000 (13:24 -0700)
1  2 
src/mesa/drivers/dri/i965/Makefile

Simple merge