R. David Murray 999df780d1 Merged revisions 76834 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76834 | r.david.murray | 2009-12-14 12:27:08 -0500 (Mon, 14 Dec 2009) | 13 lines Merged revisions 76819,76830 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76819 | benjamin.peterson | 2009-12-13 16:15:31 -0500 (Sun, 13 Dec 2009) | 1 line avoid having to update this statement all the time ........ r76830 | r.david.murray | 2009-12-13 21:50:32 -0500 (Sun, 13 Dec 2009) | 2 lines Clarify phrasing that explains that there are currently two branches. ........ ................		2009-12-14 17:31:22 +00:00
..
design.rst	Merged revisions 76491 via svnmerge from	2009-11-24 14:36:23 +00:00
extending.rst	Merged revisions 75797 via svnmerge from	2009-10-27 20:24:45 +00:00
general.rst	Merged revisions 76834 via svnmerge from	2009-12-14 17:31:22 +00:00
gui.rst	Merged revisions 75797 via svnmerge from	2009-10-27 20:24:45 +00:00
index.rst
installed.rst
library.rst	Merged revisions 75797 via svnmerge from	2009-10-27 20:24:45 +00:00
programming.rst	Merged revisions 76272 via svnmerge from	2009-11-14 22:28:36 +00:00
python-video-icon.png
windows.rst	Merged revisions 75797 via svnmerge from	2009-10-27 20:24:45 +00:00