Skip to content

Commit 228516c

Browse files
committed
merge 2.5.6c1 tag
2 parents dcdf032 + 4ca9d48 commit 228516c

File tree

6 files changed

+19
-7
lines changed

6 files changed

+19
-7
lines changed

.hgtags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,4 @@ a0a6d9909312ad9c1d844af66e9c91931b93852a v2.5.4
113113
1dc91e9dd5c13a4bc2d3bb7d4b5896ab264f2325 v2.5.5c2
114114
7098a46f0b75e5aacfaf81d65d72e3613b023532 v2.5.5
115115
a87c7b96672b69dffef64c59b56fba5bb2059b99 v2.5.6c1
116+
de34c7b097e8d66b1140c211dbd61d48b31ba483 v2.5.6

Include/patchlevel.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
#define PY_MAJOR_VERSION 2
2323
#define PY_MINOR_VERSION 5
2424
#define PY_MICRO_VERSION 6
25-
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA
26-
#define PY_RELEASE_SERIAL 1
25+
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
26+
#define PY_RELEASE_SERIAL 0
2727

2828
/* Version as a string */
29-
#define PY_VERSION "2.5.6c1"
29+
#define PY_VERSION "2.5.6"
3030

3131
/* Subversion Revision number of this file (not of the repository) */
3232
#define PY_PATCHLEVEL_REVISION "$Revision$"

Lib/idlelib/NEWS.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
What's New in IDLE 1.2.6?
2+
=========================
3+
4+
*Release date: 26-May-2011*
5+
16
What's New in IDLE 1.2.6c1?
27
===========================
38

Lib/idlelib/idlever.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
IDLE_VERSION = "1.2.6c1"
1+
IDLE_VERSION = "1.2.6"

Misc/NEWS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ Python News
44

55
(editors: check NEWS.help for information about editing NEWS using ReST.)
66

7+
What's New in Python 2.5.6?
8+
===========================
9+
10+
*Release date: 26-May-2011*
11+
12+
713
What's New in Python 2.5.6c1?
814
=============================
915

10-
*Release date: 17-Apr-2010*
16+
*Release date: 17-Apr-2011*
1117

1218
Library
1319
-------

README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
This is Python version 2.5.6c1
2-
==============================
1+
This is Python version 2.5.6
2+
============================
33

44
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
55
Python Software Foundation. All rights reserved.

0 commit comments

Comments
 (0)