aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2010-12-03 15:53:40 +0100
committerPatrik Nyblom <[email protected]>2010-12-03 15:53:40 +0100
commit5a339a8af02acc882e5ba2dbc5674acc085bdd70 (patch)
tree3abe0a587ee170a3caccf6a76e720047c208b362 /erts/preloaded
parent73b53fe24ebc595a81c4ee023bcfef5a71e59db4 (diff)
parent29c23e32a9154ef2feb6a6424647e749ce9acab1 (diff)
downloadotp-5a339a8af02acc882e5ba2dbc5674acc085bdd70.tar.gz
otp-5a339a8af02acc882e5ba2dbc5674acc085bdd70.tar.bz2
otp-5a339a8af02acc882e5ba2dbc5674acc085bdd70.zip
Merge branch 'ks/erl_bif_types-cleanup/OTP-8961' into dev
* ks/erl_bif_types-cleanup/OTP-8961: Fix type information of 'file' and 'code' modules Conflicts: lib/hipe/cerl/erl_bif_types.erl
Diffstat (limited to 'erts/preloaded')
0 files changed, 0 insertions, 0 deletions