Merge branch 'master' into flexibility-tweaks

Conflicts:
	tqdm/_tqdm.py
This commit is contained in:
Casper da Costa-Luis 2015-09-13 20:03:12 +01:00 committed by Casper da Costa-Luis
commit d86d0b1a48
1 changed files with 3 additions and 2 deletions

View File

@ -24,9 +24,10 @@ version is much more visually appealing.
## Installation
```sh
# newer, faster, prettier, stable version
pip install -e git+https://github.com/tqdm/tqdm.git@master#egg=tqdm
# or (old version on pypi)
pip install tqdm
# or
pip install -e git+https://github.com/tqdm/tqdm.git#egg=master
```
## Documentation