Merge commit 'HEAD@{1}' into develop

This commit is contained in:
ZyX 2014-11-18 23:36:01 +03:00
commit 4bb4c3f50b
2 changed files with 4 additions and 6 deletions

View File

@ -23,9 +23,8 @@ follow the installation guide below:
pip install --user git+git://github.com/Lokaltog/powerline pip install --user git+git://github.com/Lokaltog/powerline
.. note:: You need to use the GitHub URI when installing Powerline! This .. note:: Due to the naming conflict with an unrelated project powerline is
project is currently unavailable on the PyPI due to a naming conflict named ``powerline-status`` in PyPI.
with an unrelated project.
.. note:: If you are powerline developer you should be aware that ``pip install .. note:: If you are powerline developer you should be aware that ``pip install
--editable`` does not currently fully work. If you --editable`` does not currently fully work. If you

View File

@ -31,9 +31,8 @@ Python package
``--user`` flag to ``pip``. ``--user`` flag to ``pip``.
.. note:: .. note::
You need to use the GitHub URI when installing Powerline! This project is Due to the naming conflict with an unrelated project powerline is named
currently unavailable on the PyPI due to a naming conflict with an ``powerline-status`` in PyPI.
unrelated project.
.. note:: .. note::
If you are powerline developer you should be aware that ``pip install If you are powerline developer you should be aware that ``pip install