aboutsummaryrefslogtreecommitdiff
path: root/travis.sh
diff options
context:
space:
mode:
authorDan O'Reilly <oreilldf@gmail.com>2015-08-20 13:57:03 -0400
committerDan O'Reilly <oreilldf@gmail.com>2015-08-20 13:57:03 -0400
commitde22561b7b34dcf68bdf09a52df3959bed697c14 (patch)
tree0d32cd83c186a7138f75d6c56cad9a02e7681eca /travis.sh
parent3bdfb4b6951ad3db1a9493e86cd76f4f1c4d8986 (diff)
parent4fefc07ec546222b4afd27e43d2085dd76ac0373 (diff)
downloadprotobuf-de22561b7b34dcf68bdf09a52df3959bed697c14.tar.gz
protobuf-de22561b7b34dcf68bdf09a52df3959bed697c14.tar.bz2
protobuf-de22561b7b34dcf68bdf09a52df3959bed697c14.zip
Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into py2_py3_straddle
Diffstat (limited to 'travis.sh')
0 files changed, 0 insertions, 0 deletions