]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2481899 3380170)
Merge with 3.3
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 17 Mar 2013 19:25:12 +0000 (15:25 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 17 Mar 2013 19:25:12 +0000 (15:25 -0400)
1  2 
Doc/library/os.path.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/library/os.path.rst
Simple merge
Unnamed repository; edit this file 'description' to name the repository.