mesa: Changes to 'master'

[Nicolai Hähnle]

The branch, master has been updated
        Commits at: http://cgit.freedesktop.org/mesa/mesa/log/?h=master

Summary of changes:
 src/mesa/drivers/dri/r300/r300_state.c    |    3 +--
 src/mesa/drivers/dri/r300/r300_texstate.c |    6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

       via  4919cc3a2c5e779834a3ff362e417f36f12b2b17 (commit)
       via  b1056b6127d2bd6fa39ba7d88b5a49cd2765c469 (commit)
      from  1087cc61b3776f4cdc991dcd95ee59dbd26307f3 (commit)


- Commits -----------------------------------------------
commit 4919cc3a2c5e779834a3ff362e417f36f12b2b17
Author: Nicolai Haehnle <nhaehnle at gmail.com>
Date:   Fri Jun 13 18:41:16 2008 +0200

    r300: Fix depth texture GL_LUMINANCE vs. GL_INTENSITY mixup

commit b1056b6127d2bd6fa39ba7d88b5a49cd2765c469
Author: Nicolai Haehnle <nhaehnle at gmail.com>
Date:   Sat Jun 7 14:17:56 2008 +0200

    r300: Reenable t->filter_1 (though currently not used)

---------------------------------