]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 763826a 004e870)
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 23 Aug 2014 22:29:02 +0000 (18:29 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 23 Aug 2014 22:29:02 +0000 (18:29 -0400)
1  2 
Doc/glossary.rst patch | diff1 | diff2 | blob | history

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