mesa: Changes to 'mesa_7_0_branch'

[Brian Paul]

 src/mesa/drivers/dri/i915/i915_texstate.c        |   19 +++++++++++++------
 src/mesa/drivers/dri/i915/intel_context.c        |    8 ++++++++
 src/mesa/drivers/dri/i915/intel_context.h        |    4 ++++
 src/mesa/drivers/dri/i915/intel_screen.c         |    4 ++++
 src/mesa/drivers/dri/i915/intel_tex.c            |    6 +++++-
 src/mesa/drivers/dri/i915tex/intel_context.c     |    9 +++++++++
 src/mesa/drivers/dri/i915tex/intel_context.h     |    3 +++
 src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c |    3 +++
 src/mesa/drivers/dri/i915tex/intel_screen.c      |    3 +++
 9 files changed, 52 insertions(+), 7 deletions(-)

commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary

New commits:
commit 0c4e35b07043f3af0ae8eb12052aa18dca362f9c
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Mon Aug 13 21:06:33 2007 +0100

    Add PCI IDs for the G33, Q33, and Q35 chipsets.
    
    Conflicts:
    
    	src/mesa/drivers/dri/i915/i915_texstate.c
    	src/mesa/drivers/dri/i915/intel_context.c
    	src/mesa/drivers/dri/i915/intel_context.h
    	src/mesa/drivers/dri/i915/intel_screen.c
    	src/mesa/drivers/dri/i915/intel_tex.c