]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c08560 855889b)
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Wed, 18 Jan 2012 01:05:38 +0000 (02:05 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Wed, 18 Jan 2012 01:05:38 +0000 (02:05 +0100)
1  2 
Modules/timemodule.c patch | diff1 | diff2 | blob | history

diff --cc Modules/timemodule.c
Simple merge
Mirror of https://github.com/python/cpython.git