Commit 4bcec9c
committed
Merge branch 'minor_doc_fixes' of https://github.com/mdboom/matplotlib into mdboom-minor_doc_fixes
Conflicts:
.gitignore
CHANGELOG
doc/faq/installing_faq.rst
doc/sphinxext/inheritance_diagram.py
doc/users/recipes.rst32 files changed
Lines changed: 1178 additions & 1367 deletions
File tree
- doc
- devel
- faq
- mpl_toolkits
- axes_grid
- pyplots
- users
- examples
- pylab_examples
- lib/matplotlib
- sphinxext
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
| 48 | + | |
48 | 49 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
1 | 6 | | |
2 | 7 | | |
3 | 8 | | |
| |||
This file was deleted.
This file was deleted.
0 commit comments