Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
authorNian Wu <nian@graphics.(none)>
Sun, 25 Feb 2007 17:40:28 +0000 (09:40 -0800)
committerNian Wu <nian@graphics.(none)>
Sun, 25 Feb 2007 17:40:28 +0000 (09:40 -0800)
commit675f7f627bec92315bf168a9c872ffc05f88c69c
tree19c8f9cc509dc7ce73a0709832f34bf13a2c7425
parent51bfb8fc8c78bb066d24e6ecbc20f00af7210386
parentc080123998f28d9317331aec7ddfcd1074b29daf
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
src/mesa/drivers/dri/i965/intel_context.c
src/mesa/drivers/dri/i965/intel_context.h