aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2011-12-09 14:14:39 +0100
committerPeter Andersson <[email protected]>2011-12-09 14:14:39 +0100
commit4da0d1437ef78c5b6cfe2118912673020dc13b23 (patch)
treec5e9ebfc5fd0beddc3feee5657cc64c3c1bb0f08 /lib/test_server
parent100403a1f196d102ab71d84e4704bb21798ddc74 (diff)
parent34523efa4ef071a9907b4d1bbef4da4948f73f21 (diff)
downloadotp-4da0d1437ef78c5b6cfe2118912673020dc13b23.tar.gz
otp-4da0d1437ef78c5b6cfe2118912673020dc13b23.tar.bz2
otp-4da0d1437ef78c5b6cfe2118912673020dc13b23.zip
Merge branch 'r15b_app_versions'
* r15b_app_versions: Update common_test and test_server vsn
Diffstat (limited to 'lib/test_server')
-rw-r--r--lib/test_server/vsn.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/test_server/vsn.mk b/lib/test_server/vsn.mk
index 563c1b6db6..88e3856cf4 100644
--- a/lib/test_server/vsn.mk
+++ b/lib/test_server/vsn.mk
@@ -1,2 +1 @@
-TEST_SERVER_VSN = 3.4.5
-
+TEST_SERVER_VSN = 3.5