diff options
| author | Donald Stufft <donald@stufft.io> | 2014-11-19 12:39:18 -0500 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-11-19 12:39:18 -0500 |
| commit | 09ecca34b3eeb76d4f231040338e1c68bf770702 (patch) | |
| tree | 54be2e06b0bf378a4a2daa616790fa9bf949bceb /setuptools/tests/test_resources.py | |
| parent | 5e62aa3b59398252faef0d638a0f087d6c682800 (diff) | |
| parent | affa001a6767efee24b4d6bc1a2f04eb7aeea65b (diff) | |
| download | python-setuptools-git-09ecca34b3eeb76d4f231040338e1c68bf770702.tar.gz | |
Merge branch 'master' into use-packaging
Conflicts:
.hgtags
CHANGES.txt
ez_setup.py
setuptools.egg-info/requires.txt
setuptools/version.py
Diffstat (limited to 'setuptools/tests/test_resources.py')
0 files changed, 0 insertions, 0 deletions