diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-15 03:59:46 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-15 03:59:46 (GMT) |
commit | 4969f709cc07088a40574c05724d83cddc8fafc7 (patch) | |
tree | ddb254d02f2bd0c4d9d7c141f5f95521669042a0 /Mac | |
parent | c48c19afe031d0a35a3d5aacddad4e113e1aeaf0 (diff) | |
parent | 42da663e6fe7ecbb89b17d596c76812a91bb99a4 (diff) | |
download | cpython-4969f709cc07088a40574c05724d83cddc8fafc7.zip cpython-4969f709cc07088a40574c05724d83cddc8fafc7.tar.gz cpython-4969f709cc07088a40574c05724d83cddc8fafc7.tar.bz2 |
#11515: Merge with 3.1.
Diffstat (limited to 'Mac')
-rwxr-xr-x | Mac/BuildScript/build-installer.py | 2 | ||||
-rw-r--r-- | Mac/Tools/pythonw.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index f0b3f3f..0a0c0d6 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -100,7 +100,7 @@ UNIVERSALARCHS = '32-bit' ARCHLIST = universal_opts_map[UNIVERSALARCHS] -# Source directory (asume we're in Mac/BuildScript) +# Source directory (assume we're in Mac/BuildScript) SRCDIR = os.path.dirname( os.path.dirname( os.path.dirname( diff --git a/Mac/Tools/pythonw.c b/Mac/Tools/pythonw.c index 0b2fafc..30c82ac 100644 --- a/Mac/Tools/pythonw.c +++ b/Mac/Tools/pythonw.c @@ -105,8 +105,8 @@ setup_spawnattr(posix_spawnattr_t* spawnattr) count = 1; - /* Run the real python executable using the same architure as this - * executable, this allows users to controle the architecture using + /* Run the real python executable using the same architecture as this + * executable, this allows users to control the architecture using * "arch -ppc python" */ |