aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-10-03 10:14:39 +0200
committerHans Nilsson <[email protected]>2017-10-03 10:14:39 +0200
commit38d25c94cee65f69b8b44cc24a351fa887a981b2 (patch)
tree00373bff271ec115c1af78195fcf38b5a2a012bc /erts/preloaded/src
parent4d2a2f5f327aa6804c37ef7fe0c41c2f58555239 (diff)
parent8fb29181bca26c221ca0a3364f71f79d3d3a4db4 (diff)
downloadotp-38d25c94cee65f69b8b44cc24a351fa887a981b2.tar.gz
otp-38d25c94cee65f69b8b44cc24a351fa887a981b2.tar.bz2
otp-38d25c94cee65f69b8b44cc24a351fa887a981b2.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release Fix zlib merge snafu ssh: fix broken printouts ssh: exclude aes_gcm if peer is OpenSSH 6.2 (known bug) Conflicts: OTP_VERSION
Diffstat (limited to 'erts/preloaded/src')
-rw-r--r--erts/preloaded/src/zlib.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/src/zlib.erl b/erts/preloaded/src/zlib.erl
index 611010550f..3170ab6351 100644
--- a/erts/preloaded/src/zlib.erl
+++ b/erts/preloaded/src/zlib.erl
@@ -692,4 +692,4 @@ enqueue_input_1(Z, IOVec) ->
end.
enqueue_nif(_Z, _IOVec) ->
- erlang:nif_error(undef). \ No newline at end of file
+ erlang:nif_error(undef).