aboutsummaryrefslogtreecommitdiffstats
path: root/OTP_VERSION
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-11-23 15:31:29 +0100
committerIngela Anderton Andin <[email protected]>2017-11-23 15:31:29 +0100
commit8c3a10c0049fb197f438fef5380a85d7e1c53396 (patch)
treed9d9c78f8f8606d6161f472d9a71ff9d4c095a52 /OTP_VERSION
parent8c54c2199c503e7eac931b4e1765f5307726dcc8 (diff)
parent7dd7c1aad07b726759dc98bb2a439e32d2e833f1 (diff)
downloadotp-8c3a10c0049fb197f438fef5380a85d7e1c53396.tar.gz
otp-8c3a10c0049fb197f438fef5380a85d7e1c53396.tar.bz2
otp-8c3a10c0049fb197f438fef5380a85d7e1c53396.zip
Merge tag 'OTP-18.3.4.1.1' into maint-18
=== OTP-18.3.4.1.1 === Changed Applications: - ssl-7.3.3.0.1 Unchanged Applications: - asn1-4.0.2 - common_test-1.12.1 - compiler-6.0.3 - cosEvent-2.2 - cosEventDomain-1.2 - cosFileTransfer-1.2 - cosNotification-1.2.1 - cosProperty-1.2 - cosTime-1.2.1 - cosTransactions-1.3.1 - crypto-3.6.3 - debugger-4.1.2 - dialyzer-2.9 - diameter-1.11.2 - edoc-0.7.18 - eldap-1.2.1 - erl_docgen-0.4.2 - erl_interface-3.8.2 - erts-7.3.1 - et-1.5.1 - eunit-2.2.13 - gs-1.6 - hipe-3.15 - ic-4.4 - inets-6.2.4 - jinterface-1.6.1 - kernel-4.2 - megaco-3.18 - mnesia-4.13.4 - observer-2.1.2 - odbc-2.11.1 - orber-3.8.1 - os_mon-2.4 - ose-1.1 - otp_mibs-1.1 - parsetools-2.1.1 - percept-0.8.11 - public_key-1.1.1 - reltool-0.7 - runtime_tools-1.9.3 - sasl-2.7 - snmp-5.2.2 - ssh-4.2.2.1 - stdlib-2.8 - syntax_tools-1.7 - test_server-3.10 - tools-2.8.3 - typer-0.9.10 - webtool-0.9.1 - wx-1.6.1 - xmerl-1.3.10 Conflicts: OTP_VERSION lib/ssl/vsn.mk otp_versions.table
Diffstat (limited to 'OTP_VERSION')
-rw-r--r--OTP_VERSION1
1 files changed, 1 insertions, 0 deletions
diff --git a/OTP_VERSION b/OTP_VERSION
index 354a423df7..39ecdcb589 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1 +1,2 @@
18.3.4.7
+