]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad23420 2cca057)
Merge 3.1
authorVictor Stinner <victor.stinner@haypocalc.com>
Mon, 23 May 2011 12:57:05 +0000 (14:57 +0200)
committerVictor Stinner <victor.stinner@haypocalc.com>
Mon, 23 May 2011 12:57:05 +0000 (14:57 +0200)
1  2 
Lib/test/test_codecs.py patch | diff1 | diff2 | blob | history

diff --cc Lib/test/test_codecs.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.