diff options
author | Fredrik Gustafsson <[email protected]> | 2013-11-18 10:00:46 +0100 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2013-11-18 10:00:46 +0100 |
commit | 04f5e4e820f792b3f07dd232f582e6a7e0a3d3f7 (patch) | |
tree | 676a2c175d7b2e6fe993344409db35137d8186e5 /erts/emulator/beam/bif.tab | |
parent | 22b3a285aadffdb02f04230b78c167f52f7d7bc1 (diff) | |
parent | b2e4599affa6718bba60ef3846d130513e9a740d (diff) | |
download | otp-04f5e4e820f792b3f07dd232f582e6a7e0a3d3f7.tar.gz otp-04f5e4e820f792b3f07dd232f582e6a7e0a3d3f7.tar.bz2 otp-04f5e4e820f792b3f07dd232f582e6a7e0a3d3f7.zip |
Merge branch 'maint'
Conflicts:
bootstrap/lib/kernel/ebin/os.beam
Diffstat (limited to 'erts/emulator/beam/bif.tab')
-rw-r--r-- | erts/emulator/beam/bif.tab | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab index 7c8e4b31cf..b6cce84cdd 100644 --- a/erts/emulator/beam/bif.tab +++ b/erts/emulator/beam/bif.tab @@ -572,6 +572,7 @@ bif erlang:float_to_binary/2 bif erlang:binary_to_float/1 bif io:printable_range/0 +bif os:unsetenv/1 # # New in R17A |