aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap/lib/kernel/ebin/kernel.app
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-03-14 13:20:11 +0100
committerHenrik Nord <[email protected]>2016-03-14 13:20:11 +0100
commitd9318b579b555372cd86b4b11a50af9d46c7bb5d (patch)
treee476ce2b98208e229ab30a65be2a8fbe597452d3 /bootstrap/lib/kernel/ebin/kernel.app
parente3e55881b15757e15ea1995b0f8dbfd305f9e89d (diff)
parent5e1b5ef47f3f2b898d30e0425823835bd9a574d4 (diff)
downloadotp-d9318b579b555372cd86b4b11a50af9d46c7bb5d.tar.gz
otp-d9318b579b555372cd86b4b11a50af9d46c7bb5d.tar.bz2
otp-d9318b579b555372cd86b4b11a50af9d46c7bb5d.zip
Merge tag 'OTP-18.3' into maint-18
=== OTP-18.3 === Changed Applications: - asn1-4.0.2 - common_test-1.12 - compiler-6.0.3 - cosNotification-1.2.1 - cosTime-1.2.1 - cosTransactions-1.3.1 - crypto-3.6.3 - debugger-4.1.2 - dialyzer-2.9 - diameter-1.11.2 - edoc-0.7.18 - eldap-1.2.1 - erl_docgen-0.4.2 - erl_interface-3.8.2 - erts-7.3 - eunit-2.2.13 - hipe-3.15 - inets-6.2 - kernel-4.2 - mnesia-4.13.3 - observer-2.1.2 - orber-3.8.1 - public_key-1.1.1 - runtime_tools-1.9.3 - sasl-2.7 - snmp-5.2.2 - ssh-4.2.2 - ssl-7.3 - stdlib-2.8 - test_server-3.10 - tools-2.8.3 - webtool-0.9.1 - wx-1.6.1 - xmerl-1.3.10 Unchanged Applications: - cosEvent-2.2 - cosEventDomain-1.2 - cosFileTransfer-1.2 - cosProperty-1.2 - et-1.5.1 - gs-1.6 - ic-4.4 - jinterface-1.6.1 - megaco-3.18 - odbc-2.11.1 - os_mon-2.4 - ose-1.1 - otp_mibs-1.1 - parsetools-2.1.1 - percept-0.8.11 - reltool-0.7 - syntax_tools-1.7 - typer-0.9.10
Diffstat (limited to 'bootstrap/lib/kernel/ebin/kernel.app')
-rw-r--r--bootstrap/lib/kernel/ebin/kernel.app6
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap/lib/kernel/ebin/kernel.app b/bootstrap/lib/kernel/ebin/kernel.app
index 85ba41bcef..14f526c30c 100644
--- a/bootstrap/lib/kernel/ebin/kernel.app
+++ b/bootstrap/lib/kernel/ebin/kernel.app
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
{application, kernel,
[
{description, "ERTS CXC 138 10"},
- {vsn, "4.0"},
+ {vsn, "4.1.1"},
{modules, [application,
application_controller,
application_master,
@@ -116,6 +116,6 @@
{applications, []},
{env, [{error_logger, tty}]},
{mod, {kernel, []}},
- {runtime_dependencies, ["erts-7.0", "stdlib-2.5", "sasl-2.4"]}
+ {runtime_dependencies, ["erts-7.3", "stdlib-2.6", "sasl-2.6"]}
]
}.