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

Revision: 6617
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6617&view=rev
Author:   mdboom
Date:     2008-12-15 18:06:52 +0000 (Mon, 15 Dec 2008)

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

........
  r6616 | mdboom | 2008-12-15 13:06:13 -0500 (Mon, 15 Dec 2008) | 1 line
  
  Forgot to add to CHANGELOG
........

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

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-6614
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6616
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008-12-15 18:06:13 UTC (rev 6616)
+++ trunk/matplotlib/CHANGELOG	2008-12-15 18:06:52 UTC (rev 6617)
@@ -1,3 +1,6 @@
+2008-12-15 Fix \$ in non-math text with usetex off.  Document
+differences between usetex on/off - MGD
+
 2008-12-15 Fix anti-aliasing when auto-snapping - MGD
 
 2008-12-15 Fix grid lines not moving correctly during pan and zoom - MGD


Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614
   + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616


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