]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8dcc1a9 2476b98)
merge 3.4 (#22633)
authorBenjamin Peterson <benjamin@python.org>
Sat, 14 Feb 2015 20:17:47 +0000 (15:17 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 14 Feb 2015 20:17:47 +0000 (15:17 -0500)
1  2 
Python/frozenmain.c patch | diff1 | diff2 | blob | history

diff --cc Python/frozenmain.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.