diff options
| author | Björn Gustavsson <[email protected]> | 2018-02-14 08:19:16 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2018-02-14 08:19:16 +0100 |
| commit | bf0d03bd6f393b6a4f7836c5203e9a83caf457e8 (patch) | |
| tree | bd6f4dabb78d55c5d7e24d960ff9107299977e54 /bootstrap/lib/kernel/ebin/kernel.app | |
| parent | 1ae9c8d415642029738bba0aa62c170a67de3a1f (diff) | |
| parent | 8405b0c802e216f42afaafc5ec8501eba329cced (diff) | |
| download | otp-bf0d03bd6f393b6a4f7836c5203e9a83caf457e8.tar.gz otp-bf0d03bd6f393b6a4f7836c5203e9a83caf457e8.tar.bz2 otp-bf0d03bd6f393b6a4f7836c5203e9a83caf457e8.zip | |
Merge branch 'maint'
* maint:
Update primary bootstrap
Conflicts:
bootstrap/bin/start.boot
bootstrap/bin/start_clean.boot
bootstrap/lib/compiler/ebin/beam_asm.beam
bootstrap/lib/compiler/ebin/beam_jump.beam
bootstrap/lib/compiler/ebin/beam_listing.beam
bootstrap/lib/compiler/ebin/beam_type.beam
bootstrap/lib/compiler/ebin/beam_validator.beam
bootstrap/lib/compiler/ebin/compile.beam
bootstrap/lib/compiler/ebin/core_pp.beam
bootstrap/lib/compiler/ebin/v3_codegen.beam
bootstrap/lib/compiler/ebin/v3_kernel_pp.beam
bootstrap/lib/kernel/ebin/dist_util.beam
bootstrap/lib/kernel/ebin/error_logger.beam
bootstrap/lib/kernel/ebin/erts_debug.beam
bootstrap/lib/kernel/ebin/group_history.beam
bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
bootstrap/lib/kernel/ebin/kernel.app
bootstrap/lib/kernel/ebin/os.beam
bootstrap/lib/kernel/ebin/user.beam
bootstrap/lib/stdlib/ebin/array.beam
bootstrap/lib/stdlib/ebin/dets.beam
bootstrap/lib/stdlib/ebin/edlin.beam
bootstrap/lib/stdlib/ebin/erl_lint.beam
bootstrap/lib/stdlib/ebin/ets.beam
bootstrap/lib/stdlib/ebin/filelib.beam
bootstrap/lib/stdlib/ebin/filename.beam
bootstrap/lib/stdlib/ebin/gen_statem.beam
bootstrap/lib/stdlib/ebin/lib.beam
bootstrap/lib/stdlib/ebin/otp_internal.beam
bootstrap/lib/stdlib/ebin/qlc.beam
bootstrap/lib/stdlib/ebin/shell.beam
bootstrap/lib/stdlib/ebin/stdlib.appup
bootstrap/lib/stdlib/ebin/string.beam
bootstrap/lib/stdlib/ebin/unicode_util.beam
Diffstat (limited to 'bootstrap/lib/kernel/ebin/kernel.app')
| -rw-r--r-- | bootstrap/lib/kernel/ebin/kernel.app | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap/lib/kernel/ebin/kernel.app b/bootstrap/lib/kernel/ebin/kernel.app index 4979bf69b5..d027eb6bcb 100644 --- a/bootstrap/lib/kernel/ebin/kernel.app +++ b/bootstrap/lib/kernel/ebin/kernel.app @@ -22,7 +22,7 @@ {application, kernel, [ {description, "ERTS CXC 138 10"}, - {vsn, "5.4.1"}, + {vsn, "5.4.2"}, {modules, [application, application_controller, application_master, |