diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-02-24 16:48:47 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-02-24 16:48:47 (GMT) |
| commit | 6eaaeff00e43fe86ea2b832fdb9bf497eab742f7 (patch) | |
| tree | 665a53b3a4c2fc05f926f38129d55bed738ef2bb | |
| parent | 842c0f17eb7acea93eebfcf1531b583445ce3782 (diff) | |
| parent | ab5a044aec9cb12343ac66009d40e84799d52dc7 (diff) | |
| download | cpython-6eaaeff00e43fe86ea2b832fdb9bf497eab742f7.zip cpython-6eaaeff00e43fe86ea2b832fdb9bf497eab742f7.tar.gz cpython-6eaaeff00e43fe86ea2b832fdb9bf497eab742f7.tar.bz2 | |
merge 3.2
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | PC/python_nt.rc | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -94,3 +94,4 @@ cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1 ac1f7e5c05104d557d5acd922e95625ba5d1fe10 v3.2.1 c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1 137e45f15c0bd262c9ad4c032d97425bc0589456 v3.2.2 +7085403daf439adb3f9e70ef13f6bedb1c447376 v3.2.3rc1 diff --git a/PC/python_nt.rc b/PC/python_nt.rc index 8cccf2d..5295610 100644 --- a/PC/python_nt.rc +++ b/PC/python_nt.rc @@ -61,7 +61,7 @@ BEGIN VALUE "FileDescription", "Python Core\0" VALUE "FileVersion", PYTHON_VERSION VALUE "InternalName", "Python DLL\0" - VALUE "LegalCopyright", "Copyright © 2001-2011 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0" + VALUE "LegalCopyright", "Copyright © 2001-2012 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0" VALUE "OriginalFilename", PYTHON_DLL_NAME "\0" VALUE "ProductName", "Python\0" VALUE "ProductVersion", PYTHON_VERSION |