mesa: Changes to 'master'

[Brian Paul]

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

Summary of changes:
 src/mesa/shader/prog_uniform.c |    4 ++--
 src/mesa/shader/shader_api.c   |   10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

       via  6cb12704916822aa4d0895a6427e110afe4bfa58 (commit)
       via  b429e9b2d74ece0906602d2f843c0f8bf74c44f4 (commit)
      from  f6da1453c5b4add37518b2e1f27abb02854864f2 (commit)


- Commits -----------------------------------------------
commit 6cb12704916822aa4d0895a6427e110afe4bfa58
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Sat Jun 28 16:48:31 2008 -0600

    s/GL_INVALID_VALUE/GL_INVALID_OPERATION/ in _mesa_get_uniformfv()

commit b429e9b2d74ece0906602d2f843c0f8bf74c44f4
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Sat Jun 28 16:48:23 2008 -0600

    mesa: added null ptr checks

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