summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2007-05-21 11:33:42 +0200
committerJulien Cristau <jcristau@debian.org>2007-05-21 11:33:42 +0200
commita5c65989666e9a7d0eb714c52e078809eb5719c1 (patch)
treee989dc704bd73e97eef7c1da1461181e5df6b2d7
parenta8c856d43c1594953a725f63e9c24d5bb658efda (diff)
parent1865ef6fd460a5bb6c17cb30d2b4e4c95fe144b5 (diff)
Merge remote branch 'origin/debian-unstable' into debian-experimental
Conflicts: debian/changelog
-rw-r--r--debian/changelog5
1 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 80b4df90e35..e896ce998b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,14 +31,15 @@ mesa (6.5.3~rc3-1) experimental; urgency=low
-- Julien Cristau <jcristau@debian.org> Wed, 25 Apr 2007 10:36:50 +0200
-mesa (6.5.2-5) UNRELEASED; urgency=low
+mesa (6.5.2-5) unstable; urgency=low
+ [ Brice Goglin ]
* Add 07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
(closes: #420164). Thanks to Christian Ohm.
* Add 08_r300_update_window_state_when_bound_but_stamp_changed.patch
* Add 09_i915_always_enable_pixel_fog.patch
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Fri, 20 Apr 2007 18:36:51 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 18 May 2007 13:36:25 +0200
mesa (6.5.2-4) unstable; urgency=low