diff options
author | Micael Karlberg <[email protected]> | 2011-04-06 15:11:00 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-04-06 15:11:00 +0200 |
commit | 4346b5dae76052e8c06b1cda70d561b10c1c486d (patch) | |
tree | 8de6b459b429aa24e1bd9738a4fb3b6e07a083a8 /bootstrap/lib/kernel/ebin/kernel.app | |
parent | 3bc0fccb951ffb0909d2824b65d58ad31ad16cc5 (diff) | |
parent | d8dcd70f386de09109ca1f6f817a381cd1387769 (diff) | |
download | otp-4346b5dae76052e8c06b1cda70d561b10c1c486d.tar.gz otp-4346b5dae76052e8c06b1cda70d561b10c1c486d.tar.bz2 otp-4346b5dae76052e8c06b1cda70d561b10c1c486d.zip |
Merge branch 'dev' into bmk/inets/inet56_integration
Diffstat (limited to 'bootstrap/lib/kernel/ebin/kernel.app')
-rw-r--r-- | bootstrap/lib/kernel/ebin/kernel.app | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap/lib/kernel/ebin/kernel.app b/bootstrap/lib/kernel/ebin/kernel.app index 920213d720..296382abc2 100644 --- a/bootstrap/lib/kernel/ebin/kernel.app +++ b/bootstrap/lib/kernel/ebin/kernel.app @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2011. All Rights Reserved. +%% Copyright Ericsson AB 1996-2009. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -21,7 +21,7 @@ {application, kernel, [ {description, "ERTS CXC 138 10"}, - {vsn, "2.14.3"}, + {vsn, "2.14.4"}, {modules, [application, application_controller, application_master, |