SF.net SVN: matplotlib:[6582] trunk/matplotlib

[<md...@us...>]

Revision: 6582
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6582&view=rev
Author:   mdboom
Date:     2008-12-12 12:58:46 +0000 (Fri, 12 Dec 2008)

Log Message:
-----------
Merged revisions 6581 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint

........
  r6581 | mdboom | 2008-12-12 07:57:47 -0500 (Fri, 12 Dec 2008) | 1 line
  
  Trivial change to test merging
........

Modified Paths:
--------------
    trunk/matplotlib/TODO

Property Changed:
----------------
    trunk/matplotlib/
    trunk/matplotlib/doc/pyplots/README


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6578
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6581
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581

Modified: trunk/matplotlib/TODO
===================================================================
--- trunk/matplotlib/TODO	2008-12-12 12:57:47 UTC (rev 6581)
+++ trunk/matplotlib/TODO	2008-12-12 12:58:46 UTC (rev 6582)
@@ -1,3 +1,5 @@
+-- Test merging from multiple branches.
+
 -- ALMOST DONE : add print/save functionality.  Currently you can save by right
    clicking on the fig window, but you must have nothing in front of
    the window.  I suppose I need to first draw to a pixbuf.  I would
@@ -739,4 +741,4 @@
 
 -- support zoom to rect in x or y only
 
--- add Ryan's patch
\ No newline at end of file
+-- add Ryan's patch


Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /branches/v0_98_5_maint/doc/pyplots/README:6581


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