[oe-commits] Martin Jansa : mesa: add version 7.6 for newer xorg

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: a403904ffe04ebe94957b0f123ac25f6be3a140b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a403904ffe04ebe94957b0f123ac25f6be3a140b

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Nov  2 15:45:51 2009 +0100

mesa: add version 7.6 for newer xorg

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/mesa/mesa-dri_7.6.bb  |    4 ----
 recipes/mesa/mesa-xlib_7.6.bb |    4 ----
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/recipes/mesa/mesa-dri_7.6.bb b/recipes/mesa/mesa-dri_7.6.bb
index e22b483..bea43c3 100644
--- a/recipes/mesa/mesa-dri_7.6.bb
+++ b/recipes/mesa/mesa-dri_7.6.bb
@@ -8,10 +8,6 @@ DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
            ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2 \
           "
-<<<<<<< HEAD
-=======
-PE = "1"
->>>>>>> bbfe390... mesa: add version 7.6 for newer xorg
 PR = "${INC_PR}.0"
 
 # most of our targets do not have DRI so will use mesa-xlib
diff --git a/recipes/mesa/mesa-xlib_7.6.bb b/recipes/mesa/mesa-xlib_7.6.bb
index 5a17b70..2581d03 100644
--- a/recipes/mesa/mesa-xlib_7.6.bb
+++ b/recipes/mesa/mesa-xlib_7.6.bb
@@ -9,10 +9,6 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
            ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2 \
           "
 
-<<<<<<< HEAD
-=======
-PE = "1"
->>>>>>> bbfe390... mesa: add version 7.6 for newer xorg
 PR = "${INC_PR}.0"
 
 EXTRA_OECONF += "--disable-gallium --with-driver=xlib"