aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/vsn.mk
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-02-23 12:34:27 +0100
committerHenrik Nord <[email protected]>2016-02-23 12:34:27 +0100
commit4b0f9ff929a067153809a921870f7c268dca2654 (patch)
treec77641e73da3ba3a4777a8d8085dd3b1c92d8ca2 /lib/common_test/vsn.mk
parentd8699b0ca6a4e52bc04cb439d225da147161258c (diff)
parentbd5c928e1c47f05d0d7b18f4e28e42d276cfc038 (diff)
downloadotp-4b0f9ff929a067153809a921870f7c268dca2654.tar.gz
otp-4b0f9ff929a067153809a921870f7c268dca2654.tar.bz2
otp-4b0f9ff929a067153809a921870f7c268dca2654.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'lib/common_test/vsn.mk')
-rw-r--r--lib/common_test/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index f33b705dcb..34ed657e01 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.11.1
+COMMON_TEST_VSN = 1.11.2