From 1de4f9f6565438777dd461bd9fa1c9c560f69ed1 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 8 Mar 2013 09:35:37 +0100
Subject: Prepare release

---
 lib/erl_interface/doc/src/notes.xml | 16 ++++++++++++++++
 lib/erl_interface/vsn.mk            |  2 +-
 lib/ssh/doc/src/notes.xml           | 28 ++++++++++++++++++++++++++++
 lib/ssh/vsn.mk                      |  2 +-
 4 files changed, 46 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index ae25f0c9ab..4c0267c264 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -30,6 +30,22 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 3.7.12</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Superfluous trailing comma in enum erlang_char_encoding
+	    causing compile error for g++ with --pedantic option.</p>
+          <p>
+	    Own Id: OTP-10913 Aux Id: seq12264 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 3.7.11</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 06ea973d9a..9287e105df 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1 +1 @@
-EI_VSN = 3.7.11
+EI_VSN = 3.7.12
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 12175d9a29..dead764700 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,6 +29,34 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 2.1.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Bug in rekeying for daemon fixed.</p>
+          <p>
+	    Own Id: OTP-10911</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Enhanced error message and added test for ssh clients
+	    trying to start non existing subsystems.</p>
+          <p>
+	    Own Id: OTP-10714</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 2.1.4</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 9fc4b0522e..8f6aac1f5d 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 2.1.4
+SSH_VSN = 2.1.5
 APP_VSN    = "ssh-$(SSH_VSN)"
 
-- 
cgit v1.2.3