cpython

Commit Graph

Author	SHA1	Message	Date
Thomas Wouters	a977329b6f	Merge part of the trunk changes into the p3yk branch. This merges from 43030 (branch-creation time) up to 43067. 43068 and 43069 contain a little swapping action between re.py and sre.py, and this mightily confuses svn merge, so later changes are going in separately. This merge should break no additional tests. The last-merged revision is going in a 'last_merge' property on '.' (the branch directory.) Arbitrarily chosen, really; if there's a BCP for this, I couldn't find it, but we can easily change it afterwards ;)	2006-04-21 09:43:23 +00:00
Tim Peters	c0cbc8611b	Whitespace normalization.	2004-07-31 21:17:37 +00:00
Marc-André Lemburg	17b6d28c64	New codec: [ 996067 ] hp-roman8 codec	2004-07-28 15:37:54 +00:00

Author

SHA1

Message

Date

Thomas Wouters

a977329b6f

Merge part of the trunk changes into the p3yk branch. This merges from 43030

(branch-creation time) up to 43067. 43068 and 43069 contain a little
swapping action between re.py and sre.py, and this mightily confuses svn
merge, so later changes are going in separately.

This merge should break no additional tests.

The last-merged revision is going in a 'last_merge' property on '.' (the
branch directory.) Arbitrarily chosen, really; if there's a BCP for this, I
couldn't find it, but we can easily change it afterwards ;)

2006-04-21 09:43:23 +00:00

Tim Peters

c0cbc8611b

Whitespace normalization.

2004-07-31 21:17:37 +00:00

Marc-André Lemburg

17b6d28c64

New codec: [ 996067 ] hp-roman8 codec

2004-07-28 15:37:54 +00:00

3 Commits