Revision: 5835 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5835&view=rev Author: jdh2358 Date: 2008年07月24日 13:21:17 +0000 (2008年7月24日) Log Message: ----------- trying to get mlab2 changes merged Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-5787 + /branches/v0_91_maint:1-5833 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5844 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5844&view=rev Author: jdh2358 Date: 2008年07月24日 18:39:12 +0000 (2008年7月24日) Log Message: ----------- Merged revisions 5843 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint ........ r5843 | jdh2358 | 2008年07月24日 13:35:53 -0500 (2008年7月24日) | 1 line updated api changes and changelog to reflect mlab2 deprecation ........ Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-5835 + /branches/v0_91_maint:1-5843 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5846 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5846&view=rev Author: jdh2358 Date: 2008年07月24日 19:27:11 +0000 (2008年7月24日) Log Message: ----------- Merged revisions 5845 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint ........ r5845 | jdh2358 | 2008年07月24日 14:24:18 -0500 (2008年7月24日) | 1 line bumped version num ........ Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-5843 + /branches/v0_91_maint:1-5845 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6069 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6069&view=rev Author: mdboom Date: 2008年09月05日 13:23:21 +0000 (2008年9月05日) Log Message: ----------- Merged revisions 5946-6068 via svnmerge from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_91_maint ........ r6050 | mdboom | 2008年08月25日 18:21:49 -0400 (2008年8月25日) | 2 lines Fix locale problems in SVG backend (thanks, Mathieu Leplatre for reporting) ........ Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-5945 + /branches/v0_91_maint:1-6068 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6552 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6552&view=rev Author: mdboom Date: 2008年12月10日 17:29:21 +0000 (2008年12月10日) Log Message: ----------- Initialized merge tracking via "svnmerge" with revisions "1-6550" from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_4_maint Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-6428 + /branches/v0_91_maint:1-6428 /branches/v0_98_4_maint:1-6550 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6556 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6556&view=rev Author: mdboom Date: 2008年12月10日 23:27:46 +0000 (2008年12月10日) Log Message: ----------- Removed merge tracking for "svnmerge" for https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_4_maint Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-6428 /branches/v0_98_4_maint:1-6550 + /branches/v0_91_maint:1-6428 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6557 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6557&view=rev Author: mdboom Date: 2008年12月10日 23:31:19 +0000 (2008年12月10日) Log Message: ----------- Initialized merge tracking via "svnmerge" with revisions "1-6556" from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_4_maint/matplotlib Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-6428 + /branches/v0_91_maint:1-6428 /branches/v0_98_4_maint/matplotlib:1-6556 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6558 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6558&view=rev Author: mdboom Date: 2008年12月10日 23:40:00 +0000 (2008年12月10日) Log Message: ----------- Removing this merge branch tracker since it doesn't work Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-6428 /branches/v0_98_4_maint/matplotlib:1-6556 + /branches/v0_91_maint:1-6428 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6579 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6579&view=rev Author: mdboom Date: 2008年12月12日 12:49:00 +0000 (2008年12月12日) Log Message: ----------- Initialized merge tracking via "svnmerge" with revisions "1-6578" from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-6428 + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6578 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6940 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6940&view=rev Author: jouni Date: 2009年02月26日 20:20:47 +0000 (2009年2月26日) Log Message: ----------- Mark pdf backend fix as merged Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6934 + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6938 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7264 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7264&view=rev Author: evilguru Date: 2009年07月16日 20:53:24 +0000 (2009年7月16日) Log Message: ----------- Add merge tracking to the mathtex branch. Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7319 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7319&view=rev Author: mdboom Date: 2009年07月31日 13:41:58 +0000 (2009年7月31日) Log Message: ----------- Initialized merge tracking via "svnmerge" with revisions "1-7318" from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint 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/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7318 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7322 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7322&view=rev Author: mdboom Date: 2009年07月31日 13:49:33 +0000 (2009年7月31日) Log Message: ----------- Removed merge tracking for "svnmerge" for https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_91_maint 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/v0_99_maint:1-7318 + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7318 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7531 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7531&view=rev Author: jdh2358 Date: 2009年08月23日 02:13:35 +0000 (2009年8月23日) Log Message: ----------- preparing to merge Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7523 + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7517 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7750 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7750&view=rev Author: efiring Date: 2009年09月11日 21:22:52 +0000 (2009年9月11日) Log Message: ----------- Recorded merge of revisions 7749 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7749 | efiring | 2009年09月11日 11:14:15 -1000 (2009年9月11日) | 2 lines Backported quiver bug fix from trunk ........ Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7745 + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7745,7749 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7809 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7809&view=rev Author: mdboom Date: 2009年09月21日 16:33:06 +0000 (2009年9月21日) Log Message: ----------- Removed merge tracking for "svnmerge" for https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7806 + /branches/mathtex:1-7263 /branches/v0_99_maint:1-7806 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7943 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7943&view=rev Author: jdh2358 Date: 2009年11月06日 15:06:28 +0000 (2009年11月06日) Log Message: ----------- Merged revisions 7942 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7942 | jdh2358 | 2009年11月06日 09:04:33 -0600 (2009年11月06日) | 1 line backport afm fix to branch ........ Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/mathtex:1-7263 /branches/v0_99_maint:1-7929 + /branches/mathtex:1-7263 /branches/v0_99_maint:1-7942 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8143 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8143&view=rev Author: jdh2358 Date: 2010年02月22日 14:29:31 +0000 (2010年2月22日) Log Message: ----------- call update transform after setting orientation and radius Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - <<<<<<< (modified) /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_99_maint:1-8135>>>>>>> (latest) + /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.
Revision: 8147 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8147&view=rev Author: mdboom Date: 2010年02月22日 16:30:27 +0000 (2010年2月22日) 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.
Revision: 8505 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8505&view=rev Author: jdh2358 Date: 2010年07月06日 13:59:01 +0000 (2010年7月06日) Log Message: ----------- initialized merge tracking on 1.0 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/v1_0_maint:1-8504 /trunk/matplotlib:1-7315 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8507 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8507&view=rev Author: jdh2358 Date: 2010年07月06日 14:13:58 +0000 (2010年7月06日) Log Message: ----------- test commit; experimenting w/ svnmerge 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-8504 /trunk/matplotlib:1-7315 + /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.
Revision: 8508 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8508&view=rev Author: jdh2358 Date: 2010年07月06日 14:15:32 +0000 (2010年7月06日) Log Message: ----------- re-initing v1_0_maint uninit 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/v1_0_maint:1-8504 /trunk/matplotlib:1-7315 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8509 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8509&view=rev Author: jdh2358 Date: 2010年07月06日 14:20:39 +0000 (2010年7月06日) Log Message: ----------- tinkering with svnmerge init 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-8504 /trunk/matplotlib:1-7315 + /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.
Revision: 8516 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8516&view=rev Author: mdboom Date: 2010年07月06日 15:29:45 +0000 (2010年7月06日) Log Message: ----------- Setting up merge tracking for mpl1 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/v1_0_maint:1-8512 /trunk/matplotlib:1-7315 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8618 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8618&view=rev Author: jdh2358 Date: 2010年08月03日 21:35:37 +0000 (2010年8月03日) 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.