aboutsummaryrefslogtreecommitdiffstats
path: root/erts/vsn.mk
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-05-16 17:36:12 +0200
committerRickard Green <[email protected]>2013-05-16 17:36:12 +0200
commit80129f47df9b227c45b1298e64f3e62096d81bf2 (patch)
tree46ed6d985e6cc9a164cfde3e312f29ca51fdf3a1 /erts/vsn.mk
parentd7e9fafa45eb96e3c34e24f03476a42e474701f0 (diff)
parentfebb7963a74930dccccd3d23ef56a54d27fd2549 (diff)
downloadotp-80129f47df9b227c45b1298e64f3e62096d81bf2.tar.gz
otp-80129f47df9b227c45b1298e64f3e62096d81bf2.tar.bz2
otp-80129f47df9b227c45b1298e64f3e62096d81bf2.zip
Merge branch 'rickard/inet_db/OTP-11074' into maint
* rickard/inet_db/OTP-11074: Do not treat port_set_data/port_get_data as signals Conflicts: erts/preloaded/ebin/erlang.beam erts/preloaded/ebin/erts_internal.beam
Diffstat (limited to 'erts/vsn.mk')
0 files changed, 0 insertions, 0 deletions