diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-11-13 14:17:26 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-11-13 14:17:26 +0100 |
| commit | 7cf7cad70ec2b10a46b1f1c01a1d609467918492 (patch) | |
| tree | 49943be69110215a353b8a0c2f68b47098d93ee1 /erts/preloaded/src | |
| parent | 509163307c31bf4f98a638b47ee03a5b99eb2c73 (diff) | |
| parent | e61f384adff0c9b134750ee239581296d25c10cd (diff) | |
| download | otp-7cf7cad70ec2b10a46b1f1c01a1d609467918492.tar.gz otp-7cf7cad70ec2b10a46b1f1c01a1d609467918492.tar.bz2 otp-7cf7cad70ec2b10a46b1f1c01a1d609467918492.zip | |
Merge branch 'maint' of git-server:otp into maint
Diffstat (limited to 'erts/preloaded/src')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 4ba623d921..611a568014 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2252,6 +2252,7 @@ tuple_to_list(_Tuple) -> (modified_timing_level) -> integer() | undefined; (multi_scheduling) -> disabled | blocked | enabled; (multi_scheduling_blockers) -> [PID :: pid()]; + (nif_version) -> string(); (otp_release) -> string(); (port_count) -> non_neg_integer(); (port_limit) -> pos_integer(); |