aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-06-10 09:24:27 +0200
committerFredrik Gustafsson <[email protected]>2013-06-10 09:24:27 +0200
commita9375574104b8a0b2c0590efaa1c9cf2e9d01cb1 (patch)
tree56a5a5af5b6e32fce262f1e073e54eb0a0fbb216
parentf7295b48627fb84bceef61044b6f2d0cbee10c2b (diff)
parentdbabcf586546f87f81322f36d389b7c22aa1faa7 (diff)
downloadotp-a9375574104b8a0b2c0590efaa1c9cf2e9d01cb1.tar.gz
otp-a9375574104b8a0b2c0590efaa1c9cf2e9d01cb1.tar.bz2
otp-a9375574104b8a0b2c0590efaa1c9cf2e9d01cb1.zip
Merge branch 'fredrik/r16b01/prepare_release' into maint
* fredrik/r16b01/prepare_release: versions updates for erl_interface, et and os_mon
-rw-r--r--lib/erl_interface/vsn.mk2
-rw-r--r--lib/et/vsn.mk2
-rw-r--r--lib/os_mon/vsn.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 9287e105df..6f08d380ca 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1 +1 @@
-EI_VSN = 3.7.12
+EI_VSN = 3.7.13
diff --git a/lib/et/vsn.mk b/lib/et/vsn.mk
index 99532ee3f3..40cdc2b298 100644
--- a/lib/et/vsn.mk
+++ b/lib/et/vsn.mk
@@ -1 +1 @@
-ET_VSN = 1.4.4.3
+ET_VSN = 1.4.4.4
diff --git a/lib/os_mon/vsn.mk b/lib/os_mon/vsn.mk
index 7d6c5484a7..e3acea0258 100644
--- a/lib/os_mon/vsn.mk
+++ b/lib/os_mon/vsn.mk
@@ -1 +1 @@
-OS_MON_VSN = 2.2.11
+OS_MON_VSN = 2.2.12