From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Fri, 26 Nov 2010 19:51:46 +0000 (+0000)
Subject: Blocked revisions 86168,86211,86300 via svnmerge
X-Git-Tag: v3.1.3~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d160a2ff9da44f6f1d3ee8becbf596f5afbb65de;p=thirdparty%2FPython%2Fcpython.git

Blocked revisions 86168,86211,86300 via svnmerge

........
  r86168 | hirokazu.yamamoto | 2010-11-05 00:21:59 +0900 (金, 05 11 2010) | 1 line

  Updated PC/VS8.0. (mainly to follow r86137: use temporary dir in make_buildinfo.c)
........
  r86211 | hirokazu.yamamoto | 2010-11-06 02:24:13 +0900 (土, 06 11 2010) | 1 line

  Fixed socket_gethostname() on windows.
........
  r86300 | hirokazu.yamamoto | 2010-11-07 23:29:26 +0900 (日, 07 11 2010) | 1 line

  Issue #6317: Now winsound.PlaySound only accepts unicode with MvL's approval.
........
---