aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-08-24 15:08:15 +0200
committerPeter Andersson <[email protected]>2012-08-24 15:08:15 +0200
commit05e866fef530622a79f2e39b39b70d2d46c7c485 (patch)
tree2c129c182a868a05248283e49689e6423b9e2427
parentbe7dd864c1c3be162a6963b6d2bad4092c0682a9 (diff)
parent59254c874b8e571c0246b782f8ba555312f15320 (diff)
downloadotp-05e866fef530622a79f2e39b39b70d2d46c7c485.tar.gz
otp-05e866fef530622a79f2e39b39b70d2d46c7c485.tar.bz2
otp-05e866fef530622a79f2e39b39b70d2d46c7c485.zip
Merge branch 'peppe/common_test/update_vsn_files' into maint
* peppe/common_test/update_vsn_files: Update vsn.mk files
-rw-r--r--lib/common_test/vsn.mk2
-rw-r--r--lib/test_server/vsn.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index b94f7f7593..877aa775fd 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.6.1
+COMMON_TEST_VSN = 1.6.2
diff --git a/lib/test_server/vsn.mk b/lib/test_server/vsn.mk
index a1f4559083..aecf595f3f 100644
--- a/lib/test_server/vsn.mk
+++ b/lib/test_server/vsn.mk
@@ -1 +1 @@
-TEST_SERVER_VSN = 3.5.1
+TEST_SERVER_VSN = 3.5.2