On Fri, Jun 3, 2011 at 1:21 PM, Benjamin Root <ben.r...@ou.edu> wrote: > On Thu, Jun 2, 2011 at 6:46 PM, Darren Dale <dsdal...@gmail.com> wrote: >> >> Folks, >> >> We had some minor confusion with a merge a few weeks back, which >> pulled much of the master branch into the v1.0.x maintenance branch. I >> created a new v1.0.x-maint branch that rolled back all of the changes >> from that point on, and cherry-picked all of the changes that were >> actually intended for the v1.0.x branch. >> >> Please use v1.0.x-maint from now on. v1.0.x has been deleted from the >> repository (though I'll keep a local copy for a few weeks as a backup, >> just in case). >> >> If you have any changes that branched from v1.0.x after May 6 2011, >> please contact me off list so we can correctly apply those changes on >> top of v1.0.x-maint. >> >> Darren >> > > There might be a missing commit. I just noticed that a bunch of .py source > files are missing in doc/mpl_toolkits/axes_grid/figures/. This might > require cherry-picking a50874b711983cba505e which was the commit that > Michael used to restore some of the mistakes of the commits on May 6th. > > I will leave it up to Darren to figure out exactly what would be the correct > course of action.
Thanks, it should be fixed now. ------------------------------------------------------------------------------ Simplify data backup and recovery for your virtual environment with vRanger. Installation's a snap, and flexible recovery options mean your data is safe, secure and there when you need it. Discover what all the cheering's about. Get your free trial download today. http://p.sf.net/sfu/quest-dev2dev2 _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
