From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Sun, 7 Nov 2010 12:11:28 +0000 (+0000)
Subject: Blocked revisions 86168,86211,86281,86283,86285 via svnmerge
X-Git-Tag: v2.7.1rc1~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69f9f201d9bd03dd30e19274a8f3965b758b9b41;p=python

Blocked revisions 86168,86211,86281,86283,86285 via svnmerge

........
  r86168 | hirokazu.yamamoto | 2010-11-05 00:21:59 +0900 | 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 | 1 line

  Fixed socket_gethostname() on windows.
........
  r86281 | hirokazu.yamamoto | 2010-11-07 11:45:19 +0900 | 1 line

  Formatted code. (Tabify, etc)
........
  r86283 | hirokazu.yamamoto | 2010-11-07 18:23:15 +0900 | 1 line

  Issue #6317: Now winsound.PlaySound can accept non ascii filename.
........
  r86285 | hirokazu.yamamoto | 2010-11-07 20:07:44 +0900 | 1 line

  Reformatted code a bit.
........
---