8000 Merge branch 'v2.x' into master_merge · matplotlib/matplotlib@55e90bd · GitHub
[go: up one dir, main page]
Skip to content

Commit 55e90bd

Browse files
efiringefiring
committed
Merge branch 'v2.x' into master_merge
2 parents 5f553bc + a569f11 commit 55e90bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+3767
-3150
lines changed

‎doc/api/api_changes.rst

Lines changed: 224 additions & 96 deletions
Large diffs are not rendered by default.

‎doc/api/api_changes/2015-03-14-SSH.rst

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎doc/api/api_changes/2015-11-12-DDH.rst

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎doc/api/api_changes/2015-12-01-TAC.rst

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎doc/api/api_changes/2015-12-30_draw_image.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎doc/api/api_changes/2016-06-deprecate_backends.rst

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎doc/api/api_changes/2016-07-20-EF.rst

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎doc/api/api_changes/qualitative colormaps.rst

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎doc/contents.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@ Overview
1414
.. toctree::
1515
:maxdepth: 2
1616

17-
style_changes.rst
1817
users/index.rst
18+
api/index.rst
1919
faq/index.rst
20+
mpl_toolkits/index.rst
2021
resources/index.rst
2122
thirdpartypackages/index.rst
2223
devel/index.rst
23-
mpl_toolkits/index.rst
24-
api/index.rst
2524
examples/index.rst
2625
glossary/index.rst
2726

‎doc/style_changes.rst

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0