diff options
| author | Donald Stufft <donald@stufft.io> | 2014-01-02 09:08:06 -0500 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-01-02 09:08:06 -0500 |
| commit | 6bd791df1d921d66e67b7a9127dc01928526f470 (patch) | |
| tree | 6337fd954ced3e23c2ce64c2043ac254da48e995 /README.rst | |
| parent | 5fbddda2ca95ab5d0f3bb7de7804f5deb5131736 (diff) | |
| parent | e7c2ca220d4d08d1f633a46af0a7f3bc0d55fa32 (diff) | |
| download | pip-6bd791df1d921d66e67b7a9127dc01928526f470.tar.gz | |
Merge branch 'master' into develop
Conflicts:
pip/__init__.py
pip/_vendor/distlib/__init__.py
pip/_vendor/distlib/t32.exe
pip/_vendor/distlib/t64.exe
pip/_vendor/distlib/w32.exe
pip/_vendor/distlib/w64.exe
pip/_vendor/vendor.txt
tox.ini
Diffstat (limited to 'README.rst')
0 files changed, 0 insertions, 0 deletions