Commit 917b9c1

committed

Merge v1.4.x into master

Conflicts: lib/matplotlib/__init__.py lib/matplotlib/rcsetup.py white space induced conflicts

2 parents a73cd6e + 17d1bf9 commit 917b9c1Copy full SHA for 917b9c1

5 files changed

+596

-99

lines changed

+596

-99

lines changed

Comments

(0)