From cfbe87746f4c5e3bcfbcc90bccb4945e10c3ca36 Mon Sep 17 00:00:00 2001
From: Brice Goglin <bgoglin@debian.org>
Date: Wed, 24 Feb 2010 22:44:03 +0100
Subject: New upstream snapshot, to avoid fd.o bug #26734

---
 ChangeLog        | 6 ++++++
 debian/changelog | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ba870920718..477ae66f7fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+commit 293f4d51b473783d5c5ab773a1c438e0a2fe46f2
+Author: Brian Paul <brianp@vmware.com>
+Date:   Wed Feb 24 14:04:26 2010 -0700
+
+    dri: remove old assertion (see bug 26734)
+
 commit f0e99179bcf95f39ce7c4d2c2270e8a4357eaf19
 Author: Alex Deucher <alexdeucher@gmail.com>
 Date:   Wed Feb 24 12:00:28 2010 -0500
diff --git a/debian/changelog b/debian/changelog
index 6560f7395df..23af193eaf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 mesa (7.7-4) UNRELEASED; urgency=low
 
-  * Pull from upstream mesa_7_7_branch up to commit f0e99179.
+  * Pull from upstream mesa_7_7_branch up to commit 293f4d51.
     + r6xx/r7xx: emit relocation for FRAG & TILE buffer, closes: #569663.
 
  -- Brice Goglin <bgoglin@debian.org>  Wed, 24 Feb 2010 20:52:19 +0100
-- 
cgit v1.2.3