summaryrefslogtreecommitdiff
path: root/Python/future.c
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2015-02-19 22:31:29 -0600
committerZachary Ware <zachary.ware@gmail.com>2015-02-19 22:31:29 -0600
commit868a5a7bc65a4b76a8e7d5d0d60a158f3da27a89 (patch)
tree9d5cb964528419f148ff5bb3bdb410ad72557812 /Python/future.c
parent4785f5e24930fa1cb9072c59d2963d148620127d (diff)
parent56dee1e463d2a9962aca0c577a5782a89cce3dbb (diff)
downloadcpython-git-868a5a7bc65a4b76a8e7d5d0d60a158f3da27a89.tar.gz
Null merge with 3.4
(Typo was already fixed on this branch.)
Diffstat (limited to 'Python/future.c')
0 files changed, 0 insertions, 0 deletions