aboutsummaryrefslogtreecommitdiffstats
path: root/erts/vsn.mk
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2017-11-27 12:42:26 +0100
committerJohn Högberg <[email protected]>2017-11-27 12:42:26 +0100
commit0293c3bf9276bea3fc4ab31b2e697dd1be0858ea (patch)
tree171847bc34003c148b79d36d77790887811cefbd /erts/vsn.mk
parent0c79be5d1e16308c50656cd7add5502833fba81d (diff)
parentafd92e272aa6fa6836e6e5e48e8a68ba519202e1 (diff)
downloadotp-0293c3bf9276bea3fc4ab31b2e697dd1be0858ea.tar.gz
otp-0293c3bf9276bea3fc4ab31b2e697dd1be0858ea.tar.bz2
otp-0293c3bf9276bea3fc4ab31b2e697dd1be0858ea.zip
Merge branch 'john/erts/fix-nif-ioq-version/OTP-14779' into maint
Diffstat (limited to 'erts/vsn.mk')
0 files changed, 0 insertions, 0 deletions