Commit dcf50b3
committed
Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x
Conflicts:
lib/matplotlib/tests/baseline_images/test_path/xkcd.pdf
lib/matplotlib/tests/baseline_images/test_path/xkcd.png
lib/matplotlib/tests/baseline_images/test_path/xkcd.svg
images from master branch used
lib/matplotlib/tests/test_axes.py
kept both tests6 files changed
Lines changed: 12039 additions & 11987 deletions
File tree
- lib/matplotlib
- axes
- tests
- baseline_images/test_path
- src
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2336 | 2336 | | |
2337 | 2337 | | |
2338 | 2338 | | |
2339 | | - | |
2340 | | - | |
| 2339 | + | |
| 2340 | + | |
| 2341 | + | |
| 2342 | + | |
| 2343 | + | |
| 2344 | + | |
| 2345 | + | |
| 2346 | + | |
| 2347 | + | |
| 2348 | + | |
2341 | 2349 | | |
2342 | 2350 | | |
2343 | 2351 | | |
| |||
Binary file not shown.
Loading
0 commit comments