Commit 0289b4f
Merge pull request #7476 from anntzer/sticky-margins
Sticky margins
Conflicts:
lib/matplotlib/streamplot.py
- discard conflicting diff, it is on changes to code which is not backported to 2.x
lib/matplotlib/tests/test_triangulation.py
- discard win-specific test changes (they do not exist on 2.x)
lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.pdf
lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.svg
- kept version from master1 parent 58b92b2 commit 0289b4f
23 files changed
Lines changed: 3930 additions & 4219 deletions
File tree
- doc
- api
- users
- examples
- api
- pylab_examples
- lib/matplotlib
- axes
- tests
- baseline_images
- test_transforms
- test_triangulation
- tri
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
| 50 | + | |
65 | 51 | | |
66 | 52 | | |
67 | 53 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
318 | 318 | | |
319 | 319 | | |
320 | 320 | | |
321 | | - | |
322 | | - | |
323 | | - | |
324 | | - | |
325 | | - | |
326 | | - | |
327 | | - | |
328 | | - | |
329 | | - | |
330 | | - | |
331 | | - | |
332 | | - | |
333 | | - | |
334 | | - | |
335 | | - | |
336 | | - | |
337 | | - | |
338 | | - | |
339 | | - | |
340 | | - | |
341 | | - | |
342 | | - | |
343 | | - | |
344 | | - | |
345 | | - | |
346 | | - | |
347 | 321 | | |
348 | 322 | | |
349 | 323 | | |
| |||
0 commit comments