Hello all,
I managed to merge my docfix/improve_description branch over to v1.0.x, but
I am having trouble merging correctly over to master. It appears that the
README.osx and make.osx files were changed in v1.0.x, but not in master. So
my merge wants me to resolve these differences -- which I am not about ready
to do. There is also some sort of conflict with doc/faq/installing_faq.rst,
but that conflict is easy to resolve (change build_dep to build-dep).
Maybe we need to cherry-pick the changes to README.osx and make.osx from
v1.0.x to master first?
Thanks,
Ben Root
------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software
be a part of the solution? Download the Intel(R) Manageability Checker
today! http://p.sf.net/sfu/intel-dev2devmar
_______________________________________________
Matplotlib-devel mailing list
Matplotlib-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
