summaryrefslogtreecommitdiff
path: root/Python/formatter_unicode.c
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2012-09-30 13:25:23 +0530
committerNick Coghlan <ncoghlan@gmail.com>2012-09-30 13:25:23 +0530
commit638df2539e82ce1ea561b40ba979d5c8604c05d2 (patch)
treef62d0e3463c14bce8e13dd1d55ffcff66c84a93a /Python/formatter_unicode.c
parent81b409c618691d69c16f5cbef29f924d312e4863 (diff)
parent349c802fd885e744b2a803bd41e8d234cc1688e9 (diff)
downloadcpython-git-638df2539e82ce1ea561b40ba979d5c8604c05d2.tar.gz
Merge commit, because Mercurial's handling of push races is bloody awful
Diffstat (limited to 'Python/formatter_unicode.c')
0 files changed, 0 insertions, 0 deletions