mesa: Branch 'master' - 2 commits

[Brian Paul]

 src/glx/x11/Makefile      |    2 +-
 src/mesa/glapi/gl_API.xml |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree f72e7fb1d6bbec67f295988ac22087820dee21ce (from 4647f13c43a1f4f4dba60a609c370fb0a614bf49)
Author: Brian <brian at i915.localnet.net>
Date:   Sat Apr 7 20:38:25 2007 -0600

    MAX_TEXTURE_COORDS_ARB and MAX_TEXTURE_IMAGE_UNITS_ARB had wrong glGet info.
    
    Fixes bug 10371.

diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index 2821503..1f23d8c 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -7254,10 +7254,10 @@
         <size name="GetProgramivARB" mode="get"/>
     </enum>
     <enum name="MAX_TEXTURE_COORDS_ARB"        count="1"  value="0x8871">
-        <size name="GetProgramivARB" mode="get"/>
+        <size name="Get" mode="get"/>
     </enum>
     <enum name="MAX_TEXTURE_IMAGE_UNITS_ARB"   count="1"  value="0x8872">
-        <size name="GetProgramivARB" mode="get"/>
+        <size name="Get" mode="get"/>
     </enum>
 </category>
 
diff-tree 4647f13c43a1f4f4dba60a609c370fb0a614bf49 (from 20ec486baf6ee0909294e15550773f57f0789ec7)
Author: Brian <brian at i915.localnet.net>
Date:   Sat Apr 7 19:36:58 2007 -0600

    fix etags command to find headers

diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index fd83c6f..296747e 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -77,7 +77,7 @@ depend: $(SOURCES) $(MESA_GLAPI_SOURCES)
 
 # Emacs tags
 tags:
-	etags `find . -name \*.[ch]` `find ../include`
+	etags `find . -name \*.[ch]` `find $(TOP)/include`
 
 # Dummy install target
 install: