Merge pull request #194 from fritzk/extension/MESA_framebuffer_flip_y

Add MESA_framebuffer_flip_y extension
diff --git a/extensions/EXT/EXT_external_objects.txt b/extensions/EXT/EXT_external_objects.txt
index a6d0ee1..2f08164 100644
--- a/extensions/EXT/EXT_external_objects.txt
+++ b/extensions/EXT/EXT_external_objects.txt
@@ -26,8 +26,8 @@
 
 Version
 
-    Last Modified Date: September 26, 2017
-    Revision: 13
+    Last Modified Date: July 18, 2018
+    Revision: 14
 
 Number
 
@@ -663,7 +663,7 @@
 
         "For BufferStorage and BufferStorageMemEXT, the buffer object is
         that bound to <target>, which must be one of the values listed
-        in table 6.1.  For NamedBufferStroage and
+        in table 6.1.  For NamedBufferStorage and
         NamedBufferStorageMemEXT, <buffer> is the name of the buffer
         object.  For all the above commands, <size> is the size of the
         data store in basic machine units.  For BufferStorageMemEXT and
@@ -1122,6 +1122,9 @@
 
 Revision History
 
+    Revision 14, 2018-07-18 (James Jones)
+        - Fixed a typo: Replace NamedBufferStroage with NamedBufferStorage
+
     Revision 13, 2017-09-26 (James Jones)
         - Added new image layouts corresponding to those from
           VK_KHR_maintenance2.
diff --git a/xml/gl.xml b/xml/gl.xml
index 29de5c0..29d5139 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -778,6 +778,7 @@
             <enum name="GL_ACCUM_CLEAR_VALUE"/>
             <enum name="GL_ACCUM_GREEN_BITS"/>
             <enum name="GL_ACCUM_RED_BITS"/>
+            <enum name="GL_ACTIVE_TEXTURE"/>
             <enum name="GL_ALIASED_LINE_WIDTH_RANGE"/>
             <enum name="GL_ALIASED_POINT_SIZE_RANGE"/>
             <enum name="GL_ALPHA_BIAS"/>
@@ -975,6 +976,7 @@
             <enum name="GL_MAX_CLIP_DISTANCES"/>
             <enum name="GL_MAX_CLIP_PLANES"/>
             <enum name="GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI"/>
+            <enum name="GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS"/>
             <enum name="GL_MAX_EVAL_ORDER"/>
             <enum name="GL_MAX_FOG_FUNC_POINTS_SGIS"/>
             <enum name="GL_MAX_FRAGMENT_LIGHTS_SGIX"/>
@@ -16573,6 +16575,7 @@
         </command>
         <command>
             <proto group="GraphicsResetStatus"><ptype>GLenum</ptype> <name>glGetGraphicsResetStatusEXT</name></proto>
+            <alias name="glGetGraphicsResetStatus"/>
         </command>
         <command>
             <proto group="GraphicsResetStatus"><ptype>GLenum</ptype> <name>glGetGraphicsResetStatusKHR</name></proto>