aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/vsn.mk
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-01-17 16:50:33 +0100
committerFredrik Gustafsson <[email protected]>2013-01-17 16:50:33 +0100
commitb5e456083979a25404670feb3fb7f977cbe32d8b (patch)
tree6faffe24e3b2b14ae15eb6154377c75e7e284144 /lib/common_test/vsn.mk
parent2a6407b3f744ae3d170764eac9d9eb882148b898 (diff)
parent64e585da09339be629f05195cfcff7b01dcb0497 (diff)
downloadotp-b5e456083979a25404670feb3fb7f977cbe32d8b.tar.gz
otp-b5e456083979a25404670feb3fb7f977cbe32d8b.tar.bz2
otp-b5e456083979a25404670feb3fb7f977cbe32d8b.zip
Merge branch 'maint-r15'
Conflicts: erts/vsn.mk
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 f9bb22867e..c92fb2ca37 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.6.3
+COMMON_TEST_VSN = 1.7