Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BUG/DOC : fix bad merge of INSTALL #3002

Merged
merged 1 commit into from Apr 27, 2014
Merged

BUG/DOC : fix bad merge of INSTALL #3002

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions INSTALL
View file
Open in desktop
Expand Up @@ -194,15 +194,13 @@ manager on Linux, you may need to install the development packages
using pip, easy_install or installing from source, the installer
will attempt to download and install `pyparsing` from PyPI.

<<<<<<< HEAD
**Optional dependencies**

`Pillow http://python-imaging.github.io/`__
If Pillow is installed, matplotlib can read and write a larger
selection of image file formats.

**Optional GUI frameworks**
=======

libpng 1.2 (or later)
library for loading and saving :term:`PNG` files (`download
<http://www.libpng.org/pub/png/libpng.html>`__). libpng requires
Expand All @@ -215,8 +213,7 @@ libpng 1.2 (or later)
matplotlib single click installer.


**Optional**
>>>>>>> upstream/v1.3.x
**Optional GUI frameworks**

These are optional packages which you may want to install to use
matplotlib with a user interface toolkit. See
Expand Down