Merge branch 'master' into subset

This commit is contained in:
Nigel Stewart 2014-08-12 22:07:47 +10:00
commit 616f3321fa
2 changed files with 2 additions and 2 deletions

View File

@ -19,7 +19,6 @@
<li> GL_ARB_ES3_1_compatibility <li> GL_ARB_ES3_1_compatibility
<li> GL_ARB_clip_control <li> GL_ARB_clip_control
<li> GL_ARB_conditional_render_inverted <li> GL_ARB_conditional_render_inverted
<li> GL_ARB_context_flush_control
<li> GL_ARB_cull_distance <li> GL_ARB_cull_distance
<li> GL_ARB_derivative_control <li> GL_ARB_derivative_control
<li> GL_ARB_direct_state_access <li> GL_ARB_direct_state_access
@ -36,6 +35,7 @@
<li> GL_INTEL_performance_query <li> GL_INTEL_performance_query
<li> GL_KHR_blend_equation_advanced <li> GL_KHR_blend_equation_advanced
<li> GL_KHR_blend_equation_advanced_coherent <li> GL_KHR_blend_equation_advanced_coherent
<li> GL_KHR_context_flush_control
<li> GL_KHR_robust_buffer_access_behavior <li> GL_KHR_robust_buffer_access_behavior
<li> GL_KHR_robustness <li> GL_KHR_robustness
<li> GL_KHR_texture_compression_astc_hdr <li> GL_KHR_texture_compression_astc_hdr

View File

@ -115,7 +115,6 @@ width="88" height="31" border="0" alt="SourceForge Logo"></a>
<li> GL_ARB_ES3_1_compatibility <li> GL_ARB_ES3_1_compatibility
<li> GL_ARB_clip_control <li> GL_ARB_clip_control
<li> GL_ARB_conditional_render_inverted <li> GL_ARB_conditional_render_inverted
<li> GL_ARB_context_flush_control
<li> GL_ARB_cull_distance <li> GL_ARB_cull_distance
<li> GL_ARB_derivative_control <li> GL_ARB_derivative_control
<li> GL_ARB_direct_state_access <li> GL_ARB_direct_state_access
@ -132,6 +131,7 @@ width="88" height="31" border="0" alt="SourceForge Logo"></a>
<li> GL_INTEL_performance_query <li> GL_INTEL_performance_query
<li> GL_KHR_blend_equation_advanced <li> GL_KHR_blend_equation_advanced
<li> GL_KHR_blend_equation_advanced_coherent <li> GL_KHR_blend_equation_advanced_coherent
<li> GL_KHR_context_flush_control
<li> GL_KHR_robust_buffer_access_behavior <li> GL_KHR_robust_buffer_access_behavior
<li> GL_KHR_robustness <li> GL_KHR_robustness
<li> GL_KHR_texture_compression_astc_hdr <li> GL_KHR_texture_compression_astc_hdr