diff options
| author | Henrik Nord <[email protected]> | 2016-03-17 14:50:36 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2016-03-17 14:50:36 +0100 |
| commit | 523e048754f5086a6cc4fd9a250e1b495fc5b9b8 (patch) | |
| tree | fa065ea6e5593a1bf759ae799696da444dbcdd7f /erts/doc/Makefile | |
| parent | d9318b579b555372cd86b4b11a50af9d46c7bb5d (diff) | |
| parent | 6d4001de141a00b3bf37b8f7b24c5bde2b4f4015 (diff) | |
| download | otp-523e048754f5086a6cc4fd9a250e1b495fc5b9b8.tar.gz otp-523e048754f5086a6cc4fd9a250e1b495fc5b9b8.tar.bz2 otp-523e048754f5086a6cc4fd9a250e1b495fc5b9b8.zip | |
Merge tag 'OTP-17.5.6.9' into maint-18
=== OTP-17.5.6.9 ===
Changed Applications:
- diameter-1.9.2.4
- erts-6.4.1.6
- ssl-6.0.1.2
Unchanged Applications:
- asn1-3.0.4
- common_test-1.10.1
- compiler-5.0.4
- cosEvent-2.1.15
- cosEventDomain-1.1.14
- cosFileTransfer-1.1.16
- cosNotification-1.1.21
- cosProperty-1.1.17
- cosTime-1.1.14
- cosTransactions-1.2.14
- crypto-3.5
- debugger-4.0.3.1
- dialyzer-2.7.4
- edoc-0.7.16
- eldap-1.1.1
- erl_docgen-0.3.7
- erl_interface-3.7.20
- et-1.5
- eunit-2.2.9
- gs-1.5.16
- hipe-3.11.3
- ic-4.3.6
- inets-5.10.9
- jinterface-1.5.12
- kernel-3.2.0.1
- megaco-3.17.3
- mnesia-4.12.5
- observer-2.0.4
- odbc-2.10.22
- orber-3.7.1
- os_mon-2.3.1
- ose-1.0.2
- otp_mibs-1.0.10
- parsetools-2.0.12
- percept-0.8.10
- public_key-0.23
- reltool-0.6.6
- runtime_tools-1.8.16.1
- sasl-2.4.1
- snmp-5.1.2
- ssh-3.2.4
- stdlib-2.4
- syntax_tools-1.6.18
- test_server-3.8.1
- tools-2.7.2
- typer-0.9.8
- webtool-0.8.10
- wx-1.3.3
- xmerl-1.3.7
Conflicts:
OTP_VERSION
erts/doc/src/notes.xml
erts/vsn.mk
lib/diameter/doc/src/notes.xml
lib/diameter/src/base/diameter_service.erl
lib/diameter/src/diameter.appup.src
lib/diameter/vsn.mk
lib/ssl/doc/src/notes.xml
lib/ssl/vsn.mk
otp_versions.table
Diffstat (limited to 'erts/doc/Makefile')
0 files changed, 0 insertions, 0 deletions