diff options
| author | Rickard Green <[email protected]> | 2013-12-13 09:58:11 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-12-13 09:58:11 +0100 |
| commit | af17798534de376505498b86525ab8618753ebf7 (patch) | |
| tree | d8d9c88e3b211bedbb0abad1df8208b81904b998 /lib | |
| parent | 458e302f61e2de36ebd49c5a5a5b984224bdce94 (diff) | |
| parent | 51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b (diff) | |
| download | otp-af17798534de376505498b86525ab8618753ebf7.tar.gz otp-af17798534de376505498b86525ab8618753ebf7.tar.bz2 otp-af17798534de376505498b86525ab8618753ebf7.zip | |
Merge branch 'rickard/otp-17-vsn'
* rickard/otp-17-vsn:
Update versions of OTP, erts, kernel, and stdlib
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kernel/src/kernel.appup.src | 4 | ||||
| -rw-r--r-- | lib/kernel/vsn.mk | 2 | ||||
| -rw-r--r-- | lib/stdlib/src/stdlib.appup.src | 4 | ||||
| -rw-r--r-- | lib/stdlib/vsn.mk | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index ae2666d496..b946c2d1af 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -17,11 +17,11 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max two major revisions back - [{<<"2\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R15 %% Down to - max two major revisions back - [{<<"2\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R15 }. diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk index 23af0599fc..dd5316b825 100644 --- a/lib/kernel/vsn.mk +++ b/lib/kernel/vsn.mk @@ -1 +1 @@ -KERNEL_VSN = 2.17 +KERNEL_VSN = 3.0 diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src index 4c828e4434..749a9a4201 100644 --- a/lib/stdlib/src/stdlib.appup.src +++ b/lib/stdlib/src/stdlib.appup.src @@ -17,11 +17,11 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max two major revisions back - [{<<"1\\.20(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R15 %% Down to - max two major revisions back - [{<<"1\\.20(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R15 }. diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk index c9d596f737..37a6590b06 100644 --- a/lib/stdlib/vsn.mk +++ b/lib/stdlib/vsn.mk @@ -1 +1 @@ -STDLIB_VSN = 1.20 +STDLIB_VSN = 2.0 |