From: Victor Martinez <pitillo@ono.com>
Date: Tue, 12 Feb 2013 09:49:05 +0000 (+0100)
Subject: mesa: fixed conflicts in md5sum and footprint
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=c39ed7b29b89321f485a5b37727a8df3f417276e;p=ports%2Fxorg-arm.git

mesa: fixed conflicts in md5sum and footprint
---

diff --git a/mesa3d/.footprint b/mesa3d/.footprint
index 3f1f7ab..d7d9233 100644
--- a/mesa3d/.footprint
+++ b/mesa3d/.footprint
@@ -50,17 +50,10 @@ lrwxrwxrwx	root/root	usr/lib/libGLESv1_CM.so.1 -> libGLESv1_CM.so.1.1.0
 lrwxrwxrwx	root/root	usr/lib/libGLESv2.so -> libGLESv2.so.2.0.0
 lrwxrwxrwx	root/root	usr/lib/libGLESv2.so.2 -> libGLESv2.so.2.0.0
 -rwxr-xr-x	root/root	usr/lib/libGLESv2.so.2.0.0
-<<<<<<< HEAD
--rwxr-xr-x	root/root	usr/lib/libdricore9.0.1.la
-lrwxrwxrwx	root/root	usr/lib/libdricore9.0.1.so -> libdricore9.0.1.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libdricore9.0.1.so.1 -> libdricore9.0.1.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libdricore9.0.1.so.1.0.0
-=======
 -rwxr-xr-x	root/root	usr/lib/libdricore9.0.2.la
 lrwxrwxrwx	root/root	usr/lib/libdricore9.0.2.so -> libdricore9.0.2.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib/libdricore9.0.2.so.1 -> libdricore9.0.2.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libdricore9.0.2.so.1.0.0
->>>>>>> af48ac0... mesa3d: updated to 9.0.2
 -rwxr-xr-x	root/root	usr/lib/libglapi.la
 lrwxrwxrwx	root/root	usr/lib/libglapi.so -> libglapi.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libglapi.so.0 -> libglapi.so.0.0.0
diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum
index 1fc420b..65cc599 100644
--- a/mesa3d/.md5sum
+++ b/mesa3d/.md5sum
@@ -1,5 +1 @@
-<<<<<<< HEAD
-97d6554c05ea7449398afe3a0ede7018  MesaLib-9.0.1.tar.bz2
-=======
 dc45d1192203e418163e0017640e1cfc  MesaLib-9.0.2.tar.bz2
->>>>>>> af48ac0... mesa3d: updated to 9.0.2