aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2014-11-07 11:05:48 +0100
committerBruce Yinhe <[email protected]>2014-11-07 11:05:48 +0100
commit7ee73ff2f7c7b64768903316c4ed9a0faaacfa3e (patch)
treed9678549b4a20e0d984d1635cef650f5e9364b6d /erts/preloaded
parent702739cd0ca57727b4e32006e2a3ac8023c30bcb (diff)
parent983a39ab079c9f825d31cfe349588a76824d8ef2 (diff)
downloadotp-7ee73ff2f7c7b64768903316c4ed9a0faaacfa3e.tar.gz
otp-7ee73ff2f7c7b64768903316c4ed9a0faaacfa3e.tar.bz2
otp-7ee73ff2f7c7b64768903316c4ed9a0faaacfa3e.zip
Merge branch 'maint'
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/src/erlang.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 83a38da26b..2e4331e15f 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2258,6 +2258,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();