summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorINADA Naoki <inada-n@klab.com>2012-09-24 03:10:37 +0900
committerINADA Naoki <inada-n@klab.com>2012-09-24 03:10:37 +0900
commit1526316a0803c233a6752aff1bab6e951447d12a (patch)
tree1705ccd3828c981791b2a0ce1debfbcc9f598a82 /setup.py
parentd13f10c02e06b0f3c138b1726cfa8b1a31529d64 (diff)
parent477d3b152f5d36a48a8083b3720def2dd1f5d1a7 (diff)
downloadmsgpack-python-1526316a0803c233a6752aff1bab6e951447d12a.tar.gz
Merge branch '0.2-maint'
Conflicts: msgpack/_msgpack.pyx
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions