remove conflicts on python-wxgtk2.6

[debian/gnuradio] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 96f35f966db25e029d3d920a52c370a064644bee..c930917e2717b587832cbf7d05fc121750a87605 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ gnuradio (3.2.2.dfsg-2) UNRELEASED; urgency=low
   * accept patches that remove moc files and make libusrp packages depend 
     on adduser, closes: #566564, #566565, #574209, #574231, #574209
   * stop delivering custom prefs.py, closes: #559640
+  * lose the conflicts on python-wxgtk2.6, closes: #582486
 
  -- Bdale Garbee <bdale@gag.com>  Thu, 22 Apr 2010 22:45:26 -0600