summaryrefslogtreecommitdiffstats
path: root/Modules/_scproxy.c
Commit message (Collapse)AuthorAgeFilesLines
* Recorded merge of revisions 81032 via svnmerge fromAntoine Pitrou2010-05-091-202/+202
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r81032 | antoine.pitrou | 2010-05-09 17:52:27 +0200 (dim., 09 mai 2010) | 9 lines Recorded merge of revisions 81029 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines Untabify C files. Will watch buildbots. ........ ................
* Merged revisions 80198 via svnmerge fromRonald Oussoren2010-04-181-0/+261
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80198 | ronald.oussoren | 2010-04-18 22:46:11 +0200 (Sun, 18 Apr 2010) | 4 lines For for issue #7154: Port the code that uses the SystemConfiguration framework to detect the proxy settings on OSX from the trunk to python 3.2 ........