From: Ned Deily <nad@python.org>
Date: Wed, 28 Mar 2018 18:22:48 +0000 (-0400)
Subject: Merge tag 'v3.6.5' into 3.6
X-Git-Tag: v3.6.6rc1~212
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4850dd549d2e46e6a2394de23015cea9376a219;p=thirdparty%2FPython%2Fcpython.git

Merge tag 'v3.6.5' into 3.6

Python 3.6.5
---

d4850dd549d2e46e6a2394de23015cea9376a219
diff --cc Include/patchlevel.h
index 989346b30c54,3dd89f6b2b6a..1c5881e587a1
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@@ -19,11 -19,11 +19,11 @@@
  #define PY_MAJOR_VERSION	3
  #define PY_MINOR_VERSION	6
  #define PY_MICRO_VERSION	5
- #define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
- #define PY_RELEASE_SERIAL	1
+ #define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
+ #define PY_RELEASE_SERIAL	0
  
  /* Version as a string */
 -#define PY_VERSION      	"3.6.5"
 +#define PY_VERSION      	"3.6.5+"
  /*--end constants--*/
  
  /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.