Merge 2x to master #5936
Merged
Merge 2x to master #5936
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes link checker issue in documentation
DOC: Fix issue with Sphinx 1.3.4 Discarded changes to .travis.yml from matplotlib#5872
Remove reference to changelog from frontpage
mathtext: Fix bugs in conversion of apostrophes to primes
Make barbs draw correctly (Fixes matplotlib#5803) Conflicts: lib/matplotlib/tests/test_quiver.py white space vs new test
…tion DOC: add function name to deprecation warning
This was missed when moving to zero-tolerance image comparisons
…ocstring Update docstring to match kwarg default
Fix reading/writing from urllib.request objects This backport needed to exclude nbagg optimizations.
Merge pull request matplotlib#5910 from mdboom/image-read-from-url
FIX: quiver key pivot location
Backport Merge pull request matplotlib#5620 from tacaswell/fix_quiverkey
…lict Merge 15x to 2x
|
so, most of these are already on v2.x, they just weren't marked as such? The diff seems rather paltry compared to the number of merge commits. |
|
Presumably all those "merge" commits are just cherry-picked from master, so the merge back did nothing. |
|
@QuLogic is right. The merge commits were backported and the new commits that creates will be empty when merged back to master |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Yet another somewhat painful merge due to conflicts in pdf files so doing via PR