summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-08-02 21:44:25 (GMT)
committerGeorg Brandl <georg@python.org>2010-08-02 21:44:25 (GMT)
commit7d4bfb338dba4e8e01cc5d83f86f6132f4e31ced (patch)
treec91629c277351087ec1e552aa3a812e00bbd4ebd /PCbuild
parent09b7cbaacc22f4b56eec05623b35bf89deb39253 (diff)
downloadcpython-7d4bfb338dba4e8e01cc5d83f86f6132f4e31ced.zip
cpython-7d4bfb338dba4e8e01cc5d83f86f6132f4e31ced.tar.gz
cpython-7d4bfb338dba4e8e01cc5d83f86f6132f4e31ced.tar.bz2
Merged revisions 83536,83546-83548,83550,83554-83555,83558,83563,83565,83571,83574-83575 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83536 | georg.brandl | 2010-08-02 19:49:25 +0200 (Mo, 02 Aug 2010) | 1 line #8578: mention danger of not incref'ing weak referenced object. ........ r83546 | georg.brandl | 2010-08-02 21:16:34 +0200 (Mo, 02 Aug 2010) | 1 line #7973: Fix distutils options spelling. ........ r83547 | georg.brandl | 2010-08-02 21:19:26 +0200 (Mo, 02 Aug 2010) | 1 line #7386: add example that shows that trailing path separators are stripped. ........ r83548 | georg.brandl | 2010-08-02 21:23:34 +0200 (Mo, 02 Aug 2010) | 1 line #8172: how does one use a property? ........ r83550 | georg.brandl | 2010-08-02 21:32:43 +0200 (Mo, 02 Aug 2010) | 1 line #9451: strengthen warning about __*__ special name usage. ........ r83554 | georg.brandl | 2010-08-02 21:43:05 +0200 (Mo, 02 Aug 2010) | 1 line #7280: note about nasmw.exe. ........ r83555 | georg.brandl | 2010-08-02 21:44:48 +0200 (Mo, 02 Aug 2010) | 1 line #8861: remove unused variable. ........ r83558 | georg.brandl | 2010-08-02 22:05:19 +0200 (Mo, 02 Aug 2010) | 1 line #8648: document UTF-7 codec functions. ........ r83563 | georg.brandl | 2010-08-02 22:21:21 +0200 (Mo, 02 Aug 2010) | 1 line #9037: add example how to raise custom exceptions from C code. ........ r83565 | georg.brandl | 2010-08-02 22:27:20 +0200 (Mo, 02 Aug 2010) | 1 line #9111: document that do_help() looks at docstrings. ........ r83571 | georg.brandl | 2010-08-02 22:44:34 +0200 (Mo, 02 Aug 2010) | 1 line Clarify that abs() is not a namespace. ........ r83574 | georg.brandl | 2010-08-02 22:47:56 +0200 (Mo, 02 Aug 2010) | 1 line #6867: epoll.register() returns None. ........ r83575 | georg.brandl | 2010-08-02 22:52:10 +0200 (Mo, 02 Aug 2010) | 1 line #9238: zipfile does handle archive comments. ........
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/readme.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 0386b45..0802618 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -155,6 +155,8 @@ _ssl
You must install the NASM assembler from
http://nasm.sf.net
for x86 builds. Put nasmw.exe anywhere in your PATH.
+ Note: recent releases of nasm only have nasm.exe. Just rename it to
+ nasmw.exe.
You can also install ActivePerl from
http://www.activestate.com/Products/ActivePerl/