diff options
| author | John Högberg <[email protected]> | 2019-06-13 10:28:55 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-06-13 10:28:55 +0200 |
| commit | 8fb03c024165d6777f429e495af676dfe020e78a (patch) | |
| tree | f536bfadf844d2dcd0c6bd14a361c0e09b1ca305 /lib/compiler/vsn.mk | |
| parent | 898b9b35f2cad1e925ea658d2dc381c5bde01829 (diff) | |
| parent | b4fb2e5669acb02697d9a9ab168eb0fbff6f370c (diff) | |
| download | otp-8fb03c024165d6777f429e495af676dfe020e78a.tar.gz otp-8fb03c024165d6777f429e495af676dfe020e78a.tar.bz2 otp-8fb03c024165d6777f429e495af676dfe020e78a.zip | |
Merge branch 'maint-22' into maint
* maint-22:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
Diffstat (limited to 'lib/compiler/vsn.mk')
| -rw-r--r-- | lib/compiler/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk index 090579e7ee..508bbc902c 100644 --- a/lib/compiler/vsn.mk +++ b/lib/compiler/vsn.mk @@ -1 +1 @@ -COMPILER_VSN = 7.4.1 +COMPILER_VSN = 7.4.2 |