mesa: Changes to 'ubuntu'
debian/changelog | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 72329ed3011dbd5a09bafdfd49a4cc8c6bbc6858
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Jan 23 11:12:48 2009 +0200
Fix merge errors from the changelog
diff --git a/debian/changelog b/debian/changelog
index 20b4ee9..e8110b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -194,7 +194,6 @@ mesa (7.1~rc3-1) experimental; urgency=low
-- Julien Cristau <jcristau@debian.org> Sun, 13 Jul 2008 19:41:42 +0200
-<<<<<<< HEAD:debian/changelog
mesa (7.1~rc1-0ubuntu2) intrepid; urgency=low
* Merge with debian git, fixes FTBFS on sparc/hppa/ia64.
@@ -227,7 +226,7 @@ mesa (7.1~rc1-0ubuntu1) intrepid; urgency=low
* Unexport LDFLAGS (amd64 FTBFS).
-- Timo Aaltonen <tepsipakki@ubuntu.com> Fri, 04 Jul 2008 13:19:57 +0300
-=======
+
mesa (7.0.3-7) unstable; urgency=low
* Cherry-pick patch from upstream:
@@ -251,7 +250,6 @@ mesa (7.0.3-5) unstable; urgency=low
* Pull from mesa_7_0_branch (27425708).
-- Julien Cristau <jcristau@debian.org> Sat, 12 Jul 2008 18:56:19 +0200
->>>>>>> origin/debian-experimental:debian/changelog
mesa (7.0.3-4) unstable; urgency=low
Reply to: