diff options
| author | Sverker Eriksson <[email protected]> | 2014-04-10 20:45:47 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-04-10 20:45:47 +0200 |
| commit | bee0ea4125e8b47478b77904bee06f8f38bbab42 (patch) | |
| tree | dbeaaa41c6d8a96a14bd4ab4a330f30d24fa69c0 /erts/preloaded/src | |
| parent | fc2b873cc6236841f73afdcdc5ac81105a9a3cd3 (diff) | |
| parent | 9e19d1bf9fc7dc322823327e5e78f4ec0c3cee37 (diff) | |
| download | otp-bee0ea4125e8b47478b77904bee06f8f38bbab42.tar.gz otp-bee0ea4125e8b47478b77904bee06f8f38bbab42.tar.bz2 otp-bee0ea4125e8b47478b77904bee06f8f38bbab42.zip | |
Merge branch 'maint-17' into maint
Conflicts:
OTP_VERSION
erts/vsn.mk
Diffstat (limited to 'erts/preloaded/src')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index cabbbd191f..1508eed9ee 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2264,7 +2264,6 @@ tuple_to_list(_Tuple) -> (modified_timing_level) -> integer() | undefined; (multi_scheduling) -> disabled | blocked | enabled; (multi_scheduling_blockers) -> [PID :: pid()]; - (otp_correction_package) -> string(); (otp_release) -> string(); (port_count) -> non_neg_integer(); (port_limit) -> pos_integer(); |