aboutsummaryrefslogtreecommitdiffstats
path: root/lib/cosTime
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2017-12-13 10:17:42 +0100
committerHenrik Nord <[email protected]>2017-12-13 10:17:42 +0100
commit7e0d632c9635cb2cd7f635291a9c331612400334 (patch)
tree40ca76b9201d1792a886f17a23302db479e38603 /lib/cosTime
parent18a08499db5223dfc3c96b64220a4b3e6a79c799 (diff)
parent44b09e036b31b29dddc3b178e8f6b9fc96a9a874 (diff)
downloadotp-7e0d632c9635cb2cd7f635291a9c331612400334.tar.gz
otp-7e0d632c9635cb2cd7f635291a9c331612400334.tar.bz2
otp-7e0d632c9635cb2cd7f635291a9c331612400334.zip
Merge branch 'maint'
Diffstat (limited to 'lib/cosTime')
-rw-r--r--lib/cosTime/doc/src/notes.xml17
-rw-r--r--lib/cosTime/vsn.mk2
2 files changed, 17 insertions, 2 deletions
diff --git a/lib/cosTime/doc/src/notes.xml b/lib/cosTime/doc/src/notes.xml
index 686d9e6add..16e02f8b1f 100644
--- a/lib/cosTime/doc/src/notes.xml
+++ b/lib/cosTime/doc/src/notes.xml
@@ -33,7 +33,22 @@
<file>notes.xml</file>
</header>
- <section><title>cosTime 1.2.2</title>
+ <section><title>cosTime 1.2.3</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p> Removed all old unused files in the documentation.
+ </p>
+ <p>
+ Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>cosTime 1.2.2</title>
<section><title>Improvements and New Features</title>
<list>
diff --git a/lib/cosTime/vsn.mk b/lib/cosTime/vsn.mk
index 7c9cae2d2f..7d6fcbebcd 100644
--- a/lib/cosTime/vsn.mk
+++ b/lib/cosTime/vsn.mk
@@ -1,2 +1,2 @@
-COSTIME_VSN = 1.2.2
+COSTIME_VSN = 1.2.3