diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
| commit | d6f64084b9bc07d0bdd527f9354f2d1d962ed16d (patch) | |
| tree | 81b2652d421992fd63143a04885e332e83e18d07 /mesalib/docs/relnotes-7.10.1.html | |
| parent | 669b562a737c9418c53bfae69c0dbf1aabe318b4 (diff) | |
| parent | 7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb (diff) | |
| download | vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.gz vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.bz2 vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
fontconfig/src/fcint.h
fontconfig/src/fcstat.c
mesalib/src/mapi/glapi/gen/GL3x.xml
xorg-server/glx/glxext.h
Diffstat (limited to 'mesalib/docs/relnotes-7.10.1.html')
| -rw-r--r-- | mesalib/docs/relnotes-7.10.1.html | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mesalib/docs/relnotes-7.10.1.html b/mesalib/docs/relnotes-7.10.1.html index ea605d966..134591e33 100644 --- a/mesalib/docs/relnotes-7.10.1.html +++ b/mesalib/docs/relnotes-7.10.1.html @@ -185,7 +185,7 @@ with <tt>in</tt>, <tt>out</tt>, <tt>attribute</tt>, and <tt>varying</tt>.</li> <li>mesa: Change OES_standard_derivatives to be stand-alone extension</li> <li>i915: Disable extension OES_standard_derivatives</li> <li>glcpp: Raise error when modulus is zero</li> - <li>glsl: Set operators '%' and '%=' to be reserved when GLSL < 1.30</li> + <li>glsl: Set operators '%' and '%=' to be reserved when GLSL < 1.30</li> <li>glsl: Reinstate constant-folding for division by zero</li> <li>tnl: Add support for datatype GL_FIXED in vertex arrays</li> </ul></p> @@ -374,7 +374,5 @@ with <tt>in</tt>, <tt>out</tt>, <tt>attribute</tt>, and <tt>varying</tt>.</li> <li>glx: Put null check before use</li> </ul></p> -</p> - </body> </html> |