]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c55a316 7e91af3)
Merge with 3.4
authorGeorg Brandl <georg@python.org>
Wed, 25 Feb 2015 12:07:03 +0000 (13:07 +0100)
committerGeorg Brandl <georg@python.org>
Wed, 25 Feb 2015 12:07:03 +0000 (13:07 +0100)
1  2 
Doc/library/codecs.rst patch | diff1 | diff2 | blob | history

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