merge 3.2

This commit is contained in:
Ned Deily 2012-01-01 01:10:35 -08:00
commit 49890c06b6
4 changed files with 7 additions and 7 deletions

View File

@ -36,7 +36,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>IDLE</string> <string>IDLE</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>%version%, © 2001-2011 Python Software Foundation</string> <string>%version%, © 2001-2012 Python Software Foundation</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>IDLE.icns</string> <string>IDLE.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>

View File

@ -40,7 +40,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>PythonLauncher</string> <string>PythonLauncher</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>%VERSION%, © 2001-2011 Python Software Foundation</string> <string>%VERSION%, © 2001-2012 Python Software Foundation</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>PythonLauncher.icns</string> <string>PythonLauncher.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>

View File

@ -20,7 +20,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Python</string> <string>Python</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>%version%, (c) 2004-2011 Python Software Foundation.</string> <string>%version%, (c) 2004-2012 Python Software Foundation.</string>
<key>CFBundleHelpBookFolder</key> <key>CFBundleHelpBookFolder</key>
<array> <array>
<string>Documentation</string> <string>Documentation</string>
@ -37,7 +37,7 @@
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string>%version%, (c) 2004-2011 Python Software Foundation.</string> <string>%version%, (c) 2004-2012 Python Software Foundation.</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>Python</string> <string>Python</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
@ -55,6 +55,6 @@
<key>NSAppleScriptEnabled</key> <key>NSAppleScriptEnabled</key>
<true/> <true/>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string>(c) 2011 Python Software Foundation.</string> <string>(c) 2012 Python Software Foundation.</string>
</dict> </dict>
</plist> </plist>

View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>%VERSION%, (c) 2004-2011 Python Software Foundation.</string> <string>%VERSION%, (c) 2004-2012 Python Software Foundation.</string>
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string>%VERSION%, (c) 2004-2011 Python Software Foundation.</string> <string>%VERSION%, (c) 2004-2012 Python Software Foundation.</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>