mesa: Changes to 'master'

[Brian Paul]

 src/glx/x11/glxext.c             |    1 -
 src/mesa/shader/arbprogram.syn   |    4 ++--
 src/mesa/shader/arbprogram_syn.h |    2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

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

New commits:
commit 9162bc8f48dfa07ca07b60bc95e36caa2b961c0f
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Mon Mar 10 07:42:58 2008 -0600

    remove extra #include of assert.h (bug 14932)

commit dd0a9203e3c71286836f7600e99ee826ebce7a06
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Mon Mar 10 07:41:53 2008 -0600

    fix parsing of state.texenv.color (bug 14931)