diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-15 16:59:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-15 16:59:33 +0200 |
| commit | 6cba1e57f303d9b90add32c5e942375826fb1ab2 (patch) | |
| tree | 1b2a17f873c059ed5eb1f153d1ed6b765d9ef315 /mesalib/docs | |
| parent | ffc346f9ce29ccafb3b8108450bcff27d04e3b91 (diff) | |
| parent | 0e661faf8cf2e3460b5e2389414f99c035ad4d6a (diff) | |
| download | vcxsrv-6cba1e57f303d9b90add32c5e942375826fb1ab2.tar.gz vcxsrv-6cba1e57f303d9b90add32c5e942375826fb1ab2.tar.bz2 vcxsrv-6cba1e57f303d9b90add32c5e942375826fb1ab2.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/docs/news.html
mesalib/docs/relnotes.html
mesalib/src/mesa/state_tracker/st_atom_blend.c
mesalib/src/mesa/state_tracker/st_draw.c
xorg-server/Xi/exevents.c
xorg-server/dix/events.c
xorg-server/include/dix.h
Diffstat (limited to 'mesalib/docs')
| -rw-r--r-- | mesalib/docs/news.html | 9 | ||||
| -rw-r--r-- | mesalib/docs/relnotes.html | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/mesalib/docs/news.html b/mesalib/docs/news.html index 5c21c11cd..504f63437 100644 --- a/mesalib/docs/news.html +++ b/mesalib/docs/news.html @@ -11,11 +11,18 @@ <H1>News</H1>
+<h2>June 13, 2011</h2>
+
+<p>
+<a href="relnotes-7.10.3.html">Mesa 7.10.3</a> is released. This is a bug
+fix release.
+</p>
+
<h2>April 6, 2011</h2>
<p>
<a href="relnotes-7.10.2.html">Mesa 7.10.2</a> is released. This is a bug
-fix release release.
+fix release.
</p>
<h2>March 2, 2011</h2>
diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index 794fd60a2..a44f8a12c 100644 --- a/mesalib/docs/relnotes.html +++ b/mesalib/docs/relnotes.html @@ -14,6 +14,7 @@ The release notes summarize what's new or changed in each Mesa release. <UL>
<LI><A HREF="relnotes-7.11.html">7.11 release notes</A>
+<LI><A HREF="relnotes-7.10.3.html">7.10.3 release notes</A>
<LI><A HREF="relnotes-7.10.2.html">7.10.2 release notes</A>
<LI><A HREF="relnotes-7.10.1.html">7.10.1 release notes</A>
<LI><A HREF="relnotes-7.10.html">7.10 release notes</A>
|