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

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

Revision: 8147
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8147&view=rev
Author:   mdboom
Date:     2010-02-22 16:30:27 +0000 (Mon, 22 Feb 2010)

Log Message:
-----------
Fixing merge tracking from 0.99.x branch

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


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


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