Revision: 6638
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6638&view=rev
Author:   jdh2358
Date:     2008-12-16 20:03:07 +0000 (Tue, 16 Dec 2008)

Log Message:
-----------
fixed merge between 98 branch and trunk

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6633
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6637

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG  2008-12-16 19:34:32 UTC (rev 6637)
+++ trunk/matplotlib/CHANGELOG  2008-12-16 20:03:07 UTC (rev 6638)
@@ -1,9 +1,8 @@
+
 2008-12-16 Fixed dpi-dependent behavior of Legend and fancybox in Text.
-           -JJL
 
 2008-12-16 Added markevery property to Line2D to support subsampling
            of markers - JDH
-
 2008-12-15 Removed mpl_data symlink in docs.  On platforms that do not
            support symlinks, these become copies, and the font files
            are large, so the distro becomes unneccessarily bloaded.


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you.  Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

Reply via email to