From 2955ddebc32837b66d9bacb4e925ad0ed0033168 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 23 Jun 2015 10:24:26 +0200
Subject: Prepare release

---
 lib/ose/doc/src/notes.xml | 16 ++++++++++++++++
 lib/ose/vsn.mk            |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'lib/ose')

diff --git a/lib/ose/doc/src/notes.xml b/lib/ose/doc/src/notes.xml
index 56cc73e999..06881b6c99 100644
--- a/lib/ose/doc/src/notes.xml
+++ b/lib/ose/doc/src/notes.xml
@@ -31,6 +31,22 @@
   </header>
   <p>This document describes the changes made to the OSE application.</p>
 
+<section><title>Ose 1.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Change license text from Erlang Public License to Apache
+	    Public License v2</p>
+          <p>
+	    Own Id: OTP-12845</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ose 1.0.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ose/vsn.mk b/lib/ose/vsn.mk
index 70db2ed69d..fb1cf8219f 100644
--- a/lib/ose/vsn.mk
+++ b/lib/ose/vsn.mk
@@ -1 +1 @@
-OSE_VSN = 1.0.2
+OSE_VSN = 1.1
-- 
cgit v1.2.3