diff options
| author | Guido van Rossum <guido@python.org> | 2007-08-16 23:48:43 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-08-16 23:48:43 (GMT) |
| commit | af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9 (patch) | |
| tree | 7719b2787d82dd1cc7afad76ad989fc9b1f1504f /Misc | |
| parent | 10c17ba299513184e39c85fc5c3ecaf2fd13187e (diff) | |
| download | cpython-af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9.zip cpython-af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9.tar.gz cpython-af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9.tar.bz2 | |
First merge from the trunk straight into the py3k branch. I'm not
using the message generated by svnmerge, because it contains a lot of
stuff about the Doc tree, which I'm not merging this time due to the
way the Doc tree was initially added. I am however adding roman.py
which was added later to Doc/tools. I'll try to diff the two Doc
trees separately to see if there's stuff I missed.
Diffstat (limited to 'Misc')
| -rwxr-xr-x | Misc/build.sh | 1 | ||||
| -rw-r--r-- | Misc/developers.txt | 13 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Misc/build.sh b/Misc/build.sh index 2c0665f..b08a5d4 100755 --- a/Misc/build.sh +++ b/Misc/build.sh @@ -220,7 +220,6 @@ start=`current_time` # after the first release of 2.6a1 or 3.0a1. At that point, it will be clear # if there will be a similar problem with the new doc system. -# At that point, it should be clear if this code is needed or not. # Doc/commontex/boilerplate.tex is expected to always have an outstanding # modification for the date. When a release is cut, a conflict occurs. # This allows us to detect this problem and not try to build the docs diff --git a/Misc/developers.txt b/Misc/developers.txt index ae85ef5..db132ae 100644 --- a/Misc/developers.txt +++ b/Misc/developers.txt @@ -17,13 +17,14 @@ the format to accommodate documentation needs as they arise. Permissions History ------------------- -- Senthil Kumaran was given SVN access on June 16 2007 - by MvL, for his Summer-of-Code project, mentored by - Skip Montanaro. +- Jeffrey Yasskin was given SVN access on 9 August 2007 by NCN, + for his work on PEPs and other general patches. -- Alexandre Vassalotti was given SVN access on May 21 2007 - by MvL, for his Summer-of-Code project, mentored by - Brett Cannon. +- Senthil Kumaran was given SVN access on 16 June 2007 by MvL, + for his Summer-of-Code project, mentored by Skip Montanaro. + +- Alexandre Vassalotti was given SVN access on 21 May 2007 by MvL, + for his Summer-of-Code project, mentored by Brett Cannon. - Travis Oliphant was given SVN access on 17 Apr 2007 by MvL, for implementing the extended buffer protocol. |