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

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

Revision: 8520
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8520&view=rev
Author:   mdboom
Date:     2010-07-06 15:32:32 +0000 (Tue, 06 Jul 2010)

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

........
  r8519 | mdboom | 2010-07-06 11:31:53 -0400 (Tue, 06 Jul 2010) | 1 line
  
  Testing merging (removing bogus content)
........

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

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 /branches/v1_0_maint:1-8517 /trunk/matplotlib:1-7315
   + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8519 /trunk/matplotlib:1-7315

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2010-07-06 15:31:53 UTC (rev 8519)
+++ trunk/matplotlib/CHANGELOG	2010-07-06 15:32:32 UTC (rev 8520)
@@ -1,5 +1,3 @@
-2010-07-06 Testing merging
-
 2010-07-06 Tagging for mpl 1.0 at r8502
 
 


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