Revision: 6444
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6444&view=rev
Author: mdboom
Date: 2008-11-24 20:18:38 +0000 (Mon, 24 Nov 2008)
Log Message:
-----------
Remove conflict markers from CHANGELOG.
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2008-11-24 20:14:21 UTC (rev 6443)
+++ trunk/matplotlib/CHANGELOG 2008-11-24 20:18:38 UTC (rev 6444)
@@ -29,6 +29,8 @@
2008-11-09 Fix a possible EINTR problem in dviread, which might help
when saving pdf files from the qt backend. - JKS
+2008-11-05 Fix bug with zoom to rectangle and twin axes - MGD
+
2008-10-24 Added Jae Joon's fancy arrow, box and annotation
enhancements -- see
examples/pylab_examples/annotation_demo2.py
@@ -53,10 +55,6 @@
2008-10-08 Add path simplification support to paths with gaps. - EF
-=======
-2008-11-05 Fix bug with zoom to rectangle and twin axes - MGD
-
->>>>>>> .merge-right.r6428
2008-10-05 Fix problem with AFM files that don't specify the font's
full name or family name. - JKS
@@ -100,9 +98,6 @@
2008-09-10 Add "filled" kwarg to Path.intersects_path and
Path.intersects_bbox. - MGD
-=======
-2008-09-11 Fix use of backticks in PS - MGD
-
2008-09-07 Changed full arrows slightly to avoid an xpdf rendering
problem reported by Friedrich Hagedorn. - JKS
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
