Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Doc typo #1267

Closed
wants to merge 24 commits into from
Closed

Doc typo #1267

wants to merge 24 commits into from

Conversation

dmcdougall
Copy link
Member

Fix typo in docstring.

Chris Beaumont and others added 24 commits August 27, 2012 19:20
Thanks to Jostein Be Floystad for the original patch!
Conflicts:
	lib/matplotlib/__init__.py
Fix 2to3 and packaging of dateutil
Enable dynamic updating for the OS X backend
Polygon does not handle Python 3 zip objects
gswin32c expects forward slashes in file paths
backend_pgf: fix parsing of CR+LF newlines
Fix matplotlib.testing.util.MiniExpect.expect hangs on Windows
Fix mri_demo.py fails with mpl 1.2.0rc1
checkable pan/zoom buttons for QT NavigationToolbar
@dmcdougall
Copy link
Member Author

Woah. I have no idea where all those commits came from! My commit is 3e0c006.

@efiring
Copy link
Member

efiring commented Sep 17, 2012

I think you started your feature branch from upstream/master instead of upstream/v1.2.x. I suggest you start again from scratch.

@dmcdougall
Copy link
Member Author

@efiring Thanks. New PR is #1269.

@dmcdougall dmcdougall closed this Sep 17, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants