aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ose
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-06-23 10:24:26 +0200
committerErlang/OTP <[email protected]>2015-06-23 10:24:26 +0200
commit2955ddebc32837b66d9bacb4e925ad0ed0033168 (patch)
treed6bff1708a209ee317a1d1bbb78d237a999bfd23 /lib/ose
parent7cff27e14e051b6ee15f564335eb8e685e1639c1 (diff)
downloadotp-2955ddebc32837b66d9bacb4e925ad0ed0033168.tar.gz
otp-2955ddebc32837b66d9bacb4e925ad0ed0033168.tar.bz2
otp-2955ddebc32837b66d9bacb4e925ad0ed0033168.zip
Prepare release
Diffstat (limited to 'lib/ose')
-rw-r--r--lib/ose/doc/src/notes.xml16
-rw-r--r--lib/ose/vsn.mk2
2 files changed, 17 insertions, 1 deletions
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