mesa: Changes to 'master'

[Patrice Mandin]

 src/mesa/drivers/dri/nouveau/nouveau_context.c |    1 +
 src/mesa/drivers/dri/nouveau/nouveau_state.c   |    1 +
 src/mesa/drivers/dri/nouveau/nv10_state.c      |    4 ++--
 src/mesa/drivers/dri/nouveau/nv10_swtcl.c      |    8 ++++----
 4 files changed, 8 insertions(+), 6 deletions(-)

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

New commits:
commit f0aa6654e27b279ecb29e9fd19c140cb1ac7946f
Merge: 69501d7... f98bdfc...
Author: Patrice Mandin <pmandin at caramail.com>
Date:   Sat Jul 7 00:08:35 2007 +0200

    Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/mesa

commit 69501d76fc6a45da48bf4c416ac9e15edd44e7a9
Author: Patrice Mandin <pmandin at caramail.com>
Date:   Fri Jul 6 23:59:29 2007 +0200

    NV_17 is different from NV_10

commit 2adcd5bdd2ac4931bbbfd16140800330d3fd14f8
Author: Patrice Mandin <pmandin at caramail.com>
Date:   Fri Jul 6 23:55:51 2007 +0200

    NV1X don't support VIEWPORT_ORIGIN in hardware