summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2012-01-01 09:10:35 (GMT)
committerNed Deily <nad@acm.org>2012-01-01 09:10:35 (GMT)
commit49890c06b652e2d63b0b2857e5b7266e4d07e437 (patch)
tree61f21714e45c261c24febc74246269f7bbf1fc85
parenta174577f55634c4de63204b03c0ebcde131cda28 (diff)
parent4391173778b834685dec499f9824649ed768299a (diff)
downloadcpython-49890c06b652e2d63b0b2857e5b7266e4d07e437.zip
cpython-49890c06b652e2d63b0b2857e5b7266e4d07e437.tar.gz
cpython-49890c06b652e2d63b0b2857e5b7266e4d07e437.tar.bz2
merge 3.2
-rw-r--r--Mac/IDLE/IDLE.app/Contents/Info.plist2
-rw-r--r--Mac/PythonLauncher/Info.plist.in2
-rw-r--r--Mac/Resources/app/Info.plist.in6
-rw-r--r--Mac/Resources/framework/Info.plist.in4
4 files changed, 7 insertions, 7 deletions
diff --git a/Mac/IDLE/IDLE.app/Contents/Info.plist b/Mac/IDLE/IDLE.app/Contents/Info.plist
index 15922c8..35af012 100644
--- a/Mac/IDLE/IDLE.app/Contents/Info.plist
+++ b/Mac/IDLE/IDLE.app/Contents/Info.plist
@@ -36,7 +36,7 @@
<key>CFBundleExecutable</key>
<string>IDLE</string>
<key>CFBundleGetInfoString</key>
- <string>%version%, © 2001-2011 Python Software Foundation</string>
+ <string>%version%, © 2001-2012 Python Software Foundation</string>
<key>CFBundleIconFile</key>
<string>IDLE.icns</string>
<key>CFBundleIdentifier</key>
diff --git a/Mac/PythonLauncher/Info.plist.in b/Mac/PythonLauncher/Info.plist.in
index 439f8b8..913a2e0 100644
--- a/Mac/PythonLauncher/Info.plist.in
+++ b/Mac/PythonLauncher/Info.plist.in
@@ -40,7 +40,7 @@
<key>CFBundleExecutable</key>
<string>PythonLauncher</string>
<key>CFBundleGetInfoString</key>
- <string>%VERSION%, © 2001-2011 Python Software Foundation</string>
+ <string>%VERSION%, © 2001-2012 Python Software Foundation</string>
<key>CFBundleIconFile</key>
<string>PythonLauncher.icns</string>
<key>CFBundleIdentifier</key>
diff --git a/Mac/Resources/app/Info.plist.in b/Mac/Resources/app/Info.plist.in
index b586ba0..1bbca4f 100644
--- a/Mac/Resources/app/Info.plist.in
+++ b/Mac/Resources/app/Info.plist.in
@@ -20,7 +20,7 @@
<key>CFBundleExecutable</key>
<string>Python</string>
<key>CFBundleGetInfoString</key>
- <string>%version%, (c) 2004-2011 Python Software Foundation.</string>
+ <string>%version%, (c) 2004-2012 Python Software Foundation.</string>
<key>CFBundleHelpBookFolder</key>
<array>
<string>Documentation</string>
@@ -37,7 +37,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>%version%, (c) 2004-2011 Python Software Foundation.</string>
+ <string>%version%, (c) 2004-2012 Python Software Foundation.</string>
<key>CFBundleName</key>
<string>Python</string>
<key>CFBundlePackageType</key>
@@ -55,6 +55,6 @@
<key>NSAppleScriptEnabled</key>
<true/>
<key>NSHumanReadableCopyright</key>
- <string>(c) 2011 Python Software Foundation.</string>
+ <string>(c) 2012 Python Software Foundation.</string>
</dict>
</plist>
diff --git a/Mac/Resources/framework/Info.plist.in b/Mac/Resources/framework/Info.plist.in
index b5b19d4..bab46fa 100644
--- a/Mac/Resources/framework/Info.plist.in
+++ b/Mac/Resources/framework/Info.plist.in
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
- <string>%VERSION%, (c) 2004-2011 Python Software Foundation.</string>
+ <string>%VERSION%, (c) 2004-2012 Python Software Foundation.</string>
<key>CFBundleLongVersionString</key>
- <string>%VERSION%, (c) 2004-2011 Python Software Foundation.</string>
+ <string>%VERSION%, (c) 2004-2012 Python Software Foundation.</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>