mesa: Changes to 'master'

[Brian Paul]

 include/GL/gl.h |    5 +++++
 1 files changed, 5 insertions(+)

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

New commits:
commit 74519c42311c67a2f914768abbe905d321702386
Author: Brian <brian at yutani.localnet.net>
Date:   Sat May 19 08:56:15 2007 -0600

    Disable (at least for now) PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC typedef.
    
    If an app (like progs/samples/blendxor.c) includes both gl.h and glext.h
    this typedef will get hit in both headers, causing an error.
    Possibly work around by bringing GL_NV_geometry_program4 items into gl.h.