diff options
| author | Henrik Nord <[email protected]> | 2015-09-23 09:20:05 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-09-23 09:20:05 +0200 |
| commit | 3380f4d4b9b595d1f8a4c405ea484563c73313d8 (patch) | |
| tree | 0cde73061d9145df390053ecaad9f28f9603b25b /lib/compiler/vsn.mk | |
| parent | 1c68329cf60090ba686f6d431a1bf2b39b709fee (diff) | |
| parent | 1523be48ab4071b158412f4b06fe9c8d6ba3e73c (diff) | |
| download | otp-3380f4d4b9b595d1f8a4c405ea484563c73313d8.tar.gz otp-3380f4d4b9b595d1f8a4c405ea484563c73313d8.tar.bz2 otp-3380f4d4b9b595d1f8a4c405ea484563c73313d8.zip | |
Merge tag 'OTP-18.1'
=== OTP-18.1 ===
Changed Applications:
- compiler-6.0.1
- crypto-3.6.1
- debugger-4.1.1
- dialyzer-2.8.1
- diameter-1.11
- erts-7.1
- eunit-2.2.11
- hipe-3.13
- inets-6.0.1
- kernel-4.1
- mnesia-4.13.1
- odbc-2.11.1
- public_key-1.0.1
- sasl-2.6
- ssh-4.1
- ssl-7.1
- stdlib-2.6
- tools-2.8.1
- wx-1.5
Unchanged Applications:
- asn1-4.0
- common_test-1.11
- cosEvent-2.2
- cosEventDomain-1.2
- cosFileTransfer-1.2
- cosNotification-1.2
- cosProperty-1.2
- cosTime-1.2
- cosTransactions-1.3
- edoc-0.7.17
- eldap-1.2
- erl_docgen-0.4
- erl_interface-3.8
- et-1.5.1
- gs-1.6
- ic-4.4
- jinterface-1.6
- megaco-3.18
- observer-2.1
- orber-3.8
- os_mon-2.4
- ose-1.1
- otp_mibs-1.1
- parsetools-2.1
- percept-0.8.11
- reltool-0.7
- runtime_tools-1.9.1
- snmp-5.2
- syntax_tools-1.7
- test_server-3.9
- typer-0.9.9
- webtool-0.9
- xmerl-1.3.8
Conflicts:
OTP_VERSION
erts/vsn.mk
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 69f71ba5dd..357b35e47b 100644 --- a/lib/compiler/vsn.mk +++ b/lib/compiler/vsn.mk @@ -1 +1 @@ -COMPILER_VSN = 6.0 +COMPILER_VSN = 6.0.1 |