summaryrefslogtreecommitdiffstats
path: root/Lib/pkg_resources.py
Commit message (Expand)AuthorAgeFilesLines
* Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.Thomas Wouters2006-05-271-2377/+0
* Merge p3yk branch with the trunk up to revision 45595. This breaks a fairThomas Wouters2006-04-211-0/+2377