]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f8fed2 4dd27a3)
merge with 3.4
authorGeorg Brandl <georg@python.org>
Mon, 6 Oct 2014 14:48:38 +0000 (16:48 +0200)
committerGeorg Brandl <georg@python.org>
Mon, 6 Oct 2014 14:48:38 +0000 (16:48 +0200)
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.