]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38df2ad 5e6db31)
Untokenize, bad assert: Merge with 3.3
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 17 Feb 2014 21:46:43 +0000 (16:46 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 17 Feb 2014 21:46:43 +0000 (16:46 -0500)
1  2 
Lib/tokenize.py patch | diff1 | diff2 | blob | history

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