Merge pull request #456 from nwnk/glx-sgi-video-sync-interaction

GLX_SGI_video_sync: Note the interaction with ARB_framebuffer_object
diff --git a/xml/gl.xml b/xml/gl.xml
index 1319d48..6ccdaf2 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -9135,7 +9135,7 @@
         <enum value="0x8B4A" name="GL_MAX_VERTEX_UNIFORM_COMPONENTS" group="GetPName"/>
         <enum value="0x8B4A" name="GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB"/>
         <enum value="0x8B4B" name="GL_MAX_VARYING_FLOATS" group="GetPName"/>
-        <enum value="0x8B4B" name="GL_MAX_VARYING_COMPONENTS" alias="MAX_VARYING_FLOATS" group="GetPName"/>
+        <enum value="0x8B4B" name="GL_MAX_VARYING_COMPONENTS" alias="GL_MAX_VARYING_FLOATS" group="GetPName"/>
         <enum value="0x8B4B" name="GL_MAX_VARYING_COMPONENTS_EXT"/>
         <enum value="0x8B4B" name="GL_MAX_VARYING_FLOATS_ARB"/>
         <enum value="0x8B4C" name="GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS" group="GetPName"/>
@@ -40514,7 +40514,6 @@
             <enum name="GL_FRAMEBUFFER_BINDING"/>
             <enum name="GL_RENDERBUFFER_BINDING"/>
             <enum name="GL_MAX_RENDERBUFFER_SIZE"/>
-            <enum name="GL_NO_ERROR"/>
             <enum name="GL_GUILTY_CONTEXT_RESET"/>
             <enum name="GL_INNOCENT_CONTEXT_RESET"/>
             <enum name="GL_UNKNOWN_CONTEXT_RESET"/>
@@ -48145,7 +48144,6 @@
                 <enum name="GL_CONSERVATIVE_RASTER_MODE_NV"/>
                 <enum name="GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV"/>
                 <enum name="GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV"/>
-                <enum name="GL_CONSERVATIVE_RASTER_MODE_NV"/>
                 <command name="glConservativeRasterParameteriNV"/>
             </require>
         </extension>