Brian Curtin 823de00286 Merged revisions 83009 via svnmerge from ...

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83009 | brian.curtin | 2010-07-20 20:44:19 -0500 (Tue, 20 Jul 2010) | 2 lines

  Fix #9316. if/is grammar corrections.
........

2010-07-21 01:46:44 +00:00

..

_ctypes

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_io

Merged revisions 80798 via svnmerge from

2010-05-05 16:34:37 +00:00

_multiprocessing

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_sqlite

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

cjkcodecs

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

expat

Merged revisions 77682 via svnmerge from

2010-01-22 01:13:15 +00:00

zlib

…

_bisectmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_codecsmodule.c

Merged revisions 79780 via svnmerge from

2010-06-09 17:56:11 +00:00

_collectionsmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_csv.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_curses_panel.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_cursesmodule.c

Recorded merge of revisions 81215 via svnmerge from

2010-05-15 22:30:53 +00:00

_dbmmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_elementtree.c

add a replacement API for PyCObject, PyCapsule #5630

2009-05-05 22:31:58 +00:00

_functoolsmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_gdbmmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_gestalt.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_hashopenssl.c

Merged revisions 78875 via svnmerge from

2010-03-21 21:05:53 +00:00

_heapqmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_json.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_localemodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_lsprof.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_pickle.c

Merged revisions 82937 via svnmerge from

2010-07-17 23:01:39 +00:00

_randommodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_scproxy.c

Merged revisions 82281 via svnmerge from

2010-06-27 12:52:17 +00:00

_sre.c

Merged revisions 78664 via svnmerge from

2010-03-04 22:01:47 +00:00

_ssl.c

Merged revisions 82211 via svnmerge from

2010-06-25 00:13:19 +00:00

_struct.c

Merged revisions 82941 via svnmerge from

2010-07-18 07:42:29 +00:00

_testcapimodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_threadmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_tkinter.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

_weakref.c

…

addrinfo.h

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

ar_beos

…

arraymodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

atexitmodule.c

…

audioop.c

Merged revisions 82527 via svnmerge from

2010-07-04 10:15:59 +00:00

binascii.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

bz2module.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

cmathmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

config.c.in

Merged revisions 81604 via svnmerge from

2010-05-29 21:11:05 +00:00

cryptmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

datetimemodule.c

Merged revisions 82301 via svnmerge from

2010-07-11 10:41:07 +00:00

errnomodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

fcntlmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

fpectlmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

fpetestmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

gc_weakref.txt

…

gcmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

getaddrinfo.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

getbuildinfo.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

getnameinfo.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

getpath.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

grpmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

hashlib.h

…

itertoolsmodule.c

Merged revisions 81891 via svnmerge from

2010-06-11 02:28:37 +00:00

ld_so_aix

Merged revisions 72180 via svnmerge from

2009-05-01 21:18:27 +00:00

ld_so_beos

…

main.c

Merged revisions 81250-81253 via svnmerge from

2010-05-17 09:35:44 +00:00

makesetup

…

makexp_aix

…

mathmodule.c

Merged revisions 82223 via svnmerge from

2010-06-25 20:23:41 +00:00

md5module.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

mmapmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

nismodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

operator.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

ossaudiodev.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

parsermodule.c

Merged revisions 82555 via svnmerge from

2010-07-04 18:39:48 +00:00

posixmodule.c

Merged revisions 82049 via svnmerge from

2010-06-17 16:51:08 +00:00

pwdmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

pyexpat.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

python.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

readline.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

resource.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

rotatingtree.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

rotatingtree.h

…

selectmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

Setup.config.in

…

Setup.dist

#3791: remove last traces of bsddb.

2009-06-04 09:30:30 +00:00

sha1module.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

sha256module.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

sha512module.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

signalmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

socketmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

socketmodule.h

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

spwdmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

sre_constants.h

…

sre.h

…

symtablemodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

syslogmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

termios.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

testcapi_long.h

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

timemodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

tkappinit.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

tkinter.h

…

unicodedata_db.h

Merged revisions 72054 via svnmerge from

2009-04-27 22:31:40 +00:00

unicodedata.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

unicodename_db.h

…

xxmodule.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

xxsubtype.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

zipimport.c

Merged revisions 83009 via svnmerge from

2010-07-21 01:46:44 +00:00

zlibmodule.c

Merged revisions 81100 via svnmerge from

2010-05-11 23:49:58 +00:00