From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 15 Mar 2011 20:04:06 +0000 (-0500)
Subject: merge 3.1
X-Git-Tag: v3.2.1b1~291
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=274f5fa5010994ba9ddca6181b16ae751df17976;p=python

merge 3.1
---

274f5fa5010994ba9ddca6181b16ae751df17976
diff --cc Include/patchlevel.h
index f1e619f05b,58a79fef7f..e6a4902697
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@@ -23,11 -23,12 +23,12 @@@
  #define PY_RELEASE_SERIAL	0
  
  /* Version as a string */
 -#define PY_VERSION      	"3.1.3+"
 +#define PY_VERSION      	"3.2.1a0"
  /*--end constants--*/
  
- /* Subversion Revision number of this file (not of the repository) */
- #define PY_PATCHLEVEL_REVISION  "$Revision$"
+ /* Subversion Revision number of this file (not of the repository). Empty
+    since Mercurial migration. */
+ #define PY_PATCHLEVEL_REVISION  ""
  
  /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
     Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */