aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-02-22 15:34:06 +0100
committerLukas Larsson <[email protected]>2017-02-22 15:34:06 +0100
commitae5ab58d64d18365a9b94a780760fd9c50119900 (patch)
tree4939e5dd3dda76c672f350a14ab0c15041bfd033 /.gitattributes
parentdd7ab7bb569470bc6c69d2c6e6dba2cbb5978575 (diff)
parent3671dd2d426208cf0639530b294da083b5e75acd (diff)
downloadotp-ae5ab58d64d18365a9b94a780760fd9c50119900.tar.gz
otp-ae5ab58d64d18365a9b94a780760fd9c50119900.tar.bz2
otp-ae5ab58d64d18365a9b94a780760fd9c50119900.zip
Merge branch 'lukas/erts/port_control_emasculate_binary/OTP-14231' into maint
* lukas/erts/port_control_emasculate_binary/OTP-14231: erts: Emasculate binaries that are scheduled in port_control
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions