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

[<jd...@us...>]

Revision: 8618
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8618&view=rev
Author:   jdh2358
Date:     2010-08-03 21:35:37 +0000 (Tue, 03 Aug 2010)

Log Message:
-----------
svn merge failed on prop change; trying to commit to get clean tree

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


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_91_maint:1-6428 /branches/v1_0_maint:1-8614
   + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /trunk/matplotlib:1-7315


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