summaryrefslogtreecommitdiff
path: root/lib/mnesia
diff options
context:
space:
mode:
authorDan Gudmundsson <dgud@erlang.org>2011-09-28 12:06:00 +0200
committerDan Gudmundsson <dgud@erlang.org>2011-09-28 12:06:00 +0200
commit8b1b916d88663decfceab20e79b4fe9e858c1db2 (patch)
tree2d421040231c516ac08ead72b3bcad61cfa3580b /lib/mnesia
parent0843769ab9c3263b368b49b95a8b97478a82dbea (diff)
parent32ad9d12c8d600495bb8c206967ffb3172786e3e (diff)
downloaderlang-8b1b916d88663decfceab20e79b4fe9e858c1db2.tar.gz
Merge remote-tracking branch 'upstream/dev' into major
Diffstat (limited to 'lib/mnesia')
-rw-r--r--lib/mnesia/src/mnesia.appup.src2
-rw-r--r--lib/mnesia/vsn.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/mnesia/src/mnesia.appup.src b/lib/mnesia/src/mnesia.appup.src
index 3691aa249a..fe4e5e2e7a 100644
--- a/lib/mnesia/src/mnesia.appup.src
+++ b/lib/mnesia/src/mnesia.appup.src
@@ -1,11 +1,13 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {"4.4.19", [{restart_application, mnesia}]},
{"4.4.18", [{restart_application, mnesia}]},
{"4.4.17", [{restart_application, mnesia}]},
{"4.4.16", [{restart_application, mnesia}]}
],
[
+ {"4.4.19", [{restart_application, mnesia}]},
{"4.4.18", [{restart_application, mnesia}]},
{"4.4.17", [{restart_application, mnesia}]},
{"4.4.16", [{restart_application, mnesia}]}
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index 2fa629d064..a21ab007ef 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.4.19
+MNESIA_VSN = 4.5