diff options
author | Michel Dänzer <daenzer@vmware.com> | 2010-03-30 12:01:31 +0200 |
---|---|---|
committer | Michel Dänzer <daenzer@vmware.com> | 2010-03-30 12:01:31 +0200 |
commit | e5c7d1e1c8ccb493c63e33d017c28b5cf4a55829 (patch) | |
tree | 0c73ae897b0cfb09ad21e13e27f45bb11b82e75b /docs/news.html | |
parent | aa1a79036003c2aeaae24877da66e9b46a059cad (diff) | |
parent | 07c6d94cd7272524ef06b2a787667e5d626137d2 (diff) |
Merge branch '7.8'
Conflicts:
Makefile
src/mesa/main/version.h
Resolved by keeping version strings from master (also in the intel driver).
Diffstat (limited to 'docs/news.html')
-rw-r--r-- | docs/news.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/news.html b/docs/news.html index a60d7a87d8..4e4b6976a8 100644 --- a/docs/news.html +++ b/docs/news.html @@ -11,7 +11,7 @@ <H1>News</H1> -<h2>March 26, 2010</h2> +<h2>March 28, 2010</h2> <p> <a href="relnotes-7.7.1.html">Mesa 7.7.1</a> is released. This is a bug-fix release fixing issues found in the 7.7 release. |