]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cfc104e 2e20968)
Issue #10433: merge
authorNed Deily <nad@acm.org>
Mon, 30 Apr 2012 18:15:38 +0000 (11:15 -0700)
committerNed Deily <nad@acm.org>
Mon, 30 Apr 2012 18:15:38 +0000 (11:15 -0700)
1  2 
Doc/library/os.rst patch | diff1 | diff2 | blob | history

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