aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2017-11-13 12:58:04 +0100
committerBjörn Gustavsson <[email protected]>2017-11-13 13:11:37 +0100
commit8059d34e52587880b0bbb6eb2845e6a46cb19d21 (patch)
treec14b5cb1cdf470ac073143d09ace2250a88ec9d4 /bootstrap
parent743e5a4d6b71317672e2527b0ab77ec45d91aac9 (diff)
parentcde4ddc0494c9cdc8169dbc552e0e9b91c3a1b30 (diff)
downloadotp-8059d34e52587880b0bbb6eb2845e6a46cb19d21.tar.gz
otp-8059d34e52587880b0bbb6eb2845e6a46cb19d21.tar.bz2
otp-8059d34e52587880b0bbb6eb2845e6a46cb19d21.zip
Merge branch 'maint'
* maint: Recognize 'deterministic' when given in a -compile() attribute Conflicts: lib/compiler/src/beam_asm.erl
Diffstat (limited to 'bootstrap')
0 files changed, 0 insertions, 0 deletions