aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2017-06-05 10:23:09 +0200
committerLars Thorsen <[email protected]>2017-06-05 10:23:09 +0200
commit3cfd0ee2fc1edb9b6c613d8efeac2fdc51b3e4ba (patch)
tree87ddf34e763c39250d394564c23c169fc612ce25 /bootstrap
parent5b014a2d416f8a18fcd17c031d680a32bc6473d8 (diff)
parent645371eb3a5cdcdbf73bde2ec906181ec701e1cf (diff)
downloadotp-3cfd0ee2fc1edb9b6c613d8efeac2fdc51b3e4ba.tar.gz
otp-3cfd0ee2fc1edb9b6c613d8efeac2fdc51b3e4ba.tar.bz2
otp-3cfd0ee2fc1edb9b6c613d8efeac2fdc51b3e4ba.zip
Merge branch 'maint'
Conflicts: OTP_VERSION erts/vsn.mk
Diffstat (limited to 'bootstrap')
0 files changed, 0 insertions, 0 deletions