diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-03-09 11:02:37 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-03-09 11:02:37 +0000 |
| commit | 0c96690a5b6e1c2d114e7ec5f1e9d60a4ff2a330 (patch) | |
| tree | eb8aa86b722ac91c775042bd84e152c29970529c /docs/relnotes.html | |
| parent | 95c5c69b505f562b61e23fa7dd500dbdd432a70d (diff) | |
| parent | 6f4ce4a4fed9f0f0f0ee89a63e406ab86dae7150 (diff) | |
Merge commit 'origin/master' into gallium-sw-api-2
Conflicts:
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/softpipe/sp_texture.c
src/gallium/drivers/softpipe/sp_winsys.h
src/gallium/state_trackers/egl/common/egl_g3d.c
src/gallium/state_trackers/egl/x11/native_x11.c
src/gallium/state_trackers/egl/x11/native_x11.h
src/gallium/state_trackers/egl/x11/native_ximage.c
Diffstat (limited to 'docs/relnotes.html')
| -rw-r--r-- | docs/relnotes.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/relnotes.html b/docs/relnotes.html index f1f95c5d3c..3e17a1e94e 100644 --- a/docs/relnotes.html +++ b/docs/relnotes.html @@ -13,7 +13,6 @@ The release notes summarize what's new or changed in each Mesa release. </p> <UL> -<<<<<<< HEAD:docs/relnotes.html <LI><A HREF="relnotes-7.8.html">7.8 release notes</A> <LI><A HREF="relnotes-7.7.1.html">7.7.1 release notes</A> <LI><A HREF="relnotes-7.7.html">7.7 release notes</A> |