aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-09-01 11:05:10 +0200
committerSiri Hansen <[email protected]>2014-09-01 11:05:10 +0200
commitcbba3cb28d92b381f8e983f5ea326851136e064d (patch)
treef1e9dcb20bed35720a3643ad1efa9bb87b4516c4
parente10d247960c9f99a55b5984196288fc0fdabe261 (diff)
parent847c28ea7dfdc0a33f6baf9a6450d2902d586938 (diff)
downloadotp-cbba3cb28d92b381f8e983f5ea326851136e064d.tar.gz
otp-cbba3cb28d92b381f8e983f5ea326851136e064d.tar.bz2
otp-cbba3cb28d92b381f8e983f5ea326851136e064d.zip
Merge branch 'maint'
-rw-r--r--lib/common_test/src/common_test.app.src4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/common_test/src/common_test.app.src b/lib/common_test/src/common_test.app.src
index e28751fb59..580d5dbd7b 100644
--- a/lib/common_test/src/common_test.app.src
+++ b/lib/common_test/src/common_test.app.src
@@ -1,7 +1,7 @@
% This is an -*- erlang -*- file.
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2014. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -64,7 +64,7 @@
{applications, [kernel,stdlib]},
{env, []},
{runtime_dependencies,["xmerl-1.3.7","webtool-0.8.10","tools-2.6.14",
- "test_server-3.7","stdlib-2.0","ssh-3.0.1",
+ "test_server-3.7.1","stdlib-2.0","ssh-3.0.1",
"snmp-4.25.1","sasl-2.4","runtime_tools-1.8.14",
"kernel-3.0","inets-5.10","erts-6.0",
"debugger-4.0","crypto-3.3","compiler-5.0"]}]}.