]> granicus.if.org Git - python/commitdiff
Merge: #16484: Fix pydoc doc links to modules whose names are mixed case.
authorR David Murray <rdmurray@bitdance.com>
Fri, 3 Jun 2016 23:29:18 +0000 (19:29 -0400)
committerR David Murray <rdmurray@bitdance.com>
Fri, 3 Jun 2016 23:29:18 +0000 (19:29 -0400)
1  2 
Lib/pydoc.py
Lib/test/test_pydoc.py
Misc/ACKS

diff --cc Lib/pydoc.py
index 5e5a8aeaa5cd665bc26ab48d008e2ea3f3b1e034,3ca08c9b589e4b497cab6ed658967e4b6914985d..85000fe206ae56a63a502b22e85e37ebd2ed0fff
mode 100644,100755..100644
Simple merge
diff --cc Misc/ACKS
Simple merge