aboutsummaryrefslogtreecommitdiffstats
path: root/make/otp_ded.mk.in
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-11-16 14:56:00 +0100
committerHans Nilsson <[email protected]>2017-11-16 14:56:00 +0100
commit12e3758d65c6fc6d42642fb7d4f59ac9f10081f6 (patch)
treed582494b9101fa03f4fd12343e67c1ac8d3b9891 /make/otp_ded.mk.in
parent70defe957f68f5ad4a4957af29c8713556074995 (diff)
parent70213bdf6cfa2e61c7e9013c4c217a1857b9df2e (diff)
downloadotp-12e3758d65c6fc6d42642fb7d4f59ac9f10081f6.tar.gz
otp-12e3758d65c6fc6d42642fb7d4f59ac9f10081f6.tar.bz2
otp-12e3758d65c6fc6d42642fb7d4f59ac9f10081f6.zip
Merge branch 'maint-18' into maint
* maint-18: Updated OTP version Prepare release ssh: Unicode encoding fix ssh: testcases for space trailing Hello msg Remove unused test include file from test suites eldap: Repair Makefile ssh: Don't remove trailing WS in Hello msg Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk lib/compiler/doc/src/notes.xml lib/compiler/vsn.mk lib/crypto/test/blowfish_SUITE.erl lib/eldap/doc/src/notes.xml lib/eldap/vsn.mk lib/inets/test/httpd_load.erl lib/inets/test/httpd_mod.erl lib/inets/test/old_httpd_SUITE.erl lib/ssh/doc/src/notes.xml lib/ssh/vsn.mk lib/stdlib/test/zip_SUITE.erl otp_versions.table
Diffstat (limited to 'make/otp_ded.mk.in')
0 files changed, 0 insertions, 0 deletions