From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Fri, 29 Jan 2010 11:51:11 +0000 (+0000)
Subject: Blocked revisions 77818-77819 via svnmerge
X-Git-Tag: v3.1.2rc1~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d692c4a754c7a389d4dba4ca1f1d67ce5287e92d;p=python

Blocked revisions 77818-77819 via svnmerge

................
  r77818 | tarek.ziade | 2010-01-29 12:41:03 +0100 (Fri, 29 Jan 2010) | 13 lines

  Merged revisions 77704,77752 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r77704 | tarek.ziade | 2010-01-23 10:23:15 +0100 (Sat, 23 Jan 2010) | 1 line

    taking sysconfig out of distutils
  ........
    r77752 | tarek.ziade | 2010-01-26 00:19:56 +0100 (Tue, 26 Jan 2010) | 1 line

    switched the call order so this call works without suffering from issue #7774
  ........
................
  r77819 | tarek.ziade | 2010-01-29 12:46:31 +0100 (Fri, 29 Jan 2010) | 13 lines

  Merged revisions 77759,77761 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r77759 | tarek.ziade | 2010-01-26 22:21:54 +0100 (Tue, 26 Jan 2010) | 1 line

    reintroduced the names in Distutils for APIs that were relocated
  ........
    r77761 | tarek.ziade | 2010-01-26 23:46:15 +0100 (Tue, 26 Jan 2010) | 1 line

    added local get_platform/set_platform APIs in distutils.sysconfig
  ........
................
---