diff options
| author | Raimo Niskanen <[email protected]> | 2016-08-31 10:28:25 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-08-31 10:28:25 +0200 |
| commit | 4bd631ddf4dc218135ce22bb1e6c755338515df8 (patch) | |
| tree | d7f9eebb142fa8ee4c888ce5d110ba60cfde0344 /lib/ssh | |
| parent | 65f886985dbcada1ab3e2023e391d5c2710966ce (diff) | |
| parent | bba0f5924fa9478d41903331a3285f117c112731 (diff) | |
| download | otp-4bd631ddf4dc218135ce22bb1e6c755338515df8.tar.gz otp-4bd631ddf4dc218135ce22bb1e6c755338515df8.tar.bz2 otp-4bd631ddf4dc218135ce22bb1e6c755338515df8.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/src/ssh.app.src | 2 | ||||
| -rw-r--r-- | lib/ssh/vsn.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src index 3245ba5197..76b7d8cd55 100644 --- a/lib/ssh/src/ssh.app.src +++ b/lib/ssh/src/ssh.app.src @@ -45,7 +45,7 @@ "erts-6.0", "kernel-3.0", "public_key-1.1", - "stdlib-3.0" + "stdlib-3.1" ]}]}. diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 575c1af3a9..212b99c695 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,5 +1,5 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 4.3.1 +SSH_VSN = 4.3.2 APP_VSN = "ssh-$(SSH_VSN)" |