summaryrefslogtreecommitdiffstats
path: root/Modules/_scproxy.c
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-06-27 12:46:19 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2010-06-27 12:46:19 (GMT)
commita75facfdc7f1d3595aa717cef43dbedef209d0e1 (patch)
treeea0f20e11c3017bf3d6c105e285f94e16406ca8a /Modules/_scproxy.c
parent0f2985c1c2861beec8e56f933ca207248e33c271 (diff)
downloadcpython-a75facfdc7f1d3595aa717cef43dbedef209d0e1.zip
cpython-a75facfdc7f1d3595aa717cef43dbedef209d0e1.tar.gz
cpython-a75facfdc7f1d3595aa717cef43dbedef209d0e1.tar.bz2
Merged revisions 82278 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r82278 | ronald.oussoren | 2010-06-27 14:45:47 +0200 (Sun, 27 Jun 2010) | 12 lines Merged revisions 82276 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r82276 | ronald.oussoren | 2010-06-27 14:43:47 +0200 (Sun, 27 Jun 2010) | 5 lines The uuid library on OSX 10.5 seems to contain the same bug as the one on OSX 10.6, therefore don't use it there either. This fixes issue8621. ........ ................
Diffstat (limited to 'Modules/_scproxy.c')
0 files changed, 0 insertions, 0 deletions