aboutsummaryrefslogtreecommitdiffstats
path: root/lib/cosTime
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2011-12-12 18:14:34 +0100
committerErlang/OTP <otp@erlang.org>2011-12-12 18:14:34 +0100
commitb92ea63417bc6933393a3c285faf393b3d287ac2 (patch)
treed1c474aa16fb8068f7331e62fce131f5b02afeba /lib/cosTime
parentceb98f28568ed42a0d31a76ff4a2f0171a77bda8 (diff)
downloadotp-b92ea63417bc6933393a3c285faf393b3d287ac2.tar.gz
otp-b92ea63417bc6933393a3c285faf393b3d287ac2.tar.bz2
otp-b92ea63417bc6933393a3c285faf393b3d287ac2.zip
Prepare release
Diffstat (limited to 'lib/cosTime')
-rw-r--r--lib/cosTime/doc/src/notes.xml20
-rw-r--r--lib/cosTime/vsn.mk2
2 files changed, 20 insertions, 2 deletions
diff --git a/lib/cosTime/doc/src/notes.xml b/lib/cosTime/doc/src/notes.xml
index 3698e4813e..c70978df2b 100644
--- a/lib/cosTime/doc/src/notes.xml
+++ b/lib/cosTime/doc/src/notes.xml
@@ -32,7 +32,25 @@
<file>notes.xml</file>
</header>
- <section>
+ <section><title>cosTime 1.1.12</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>Erlang/OTP can now be built using parallel make if you
+ limit the number of jobs, for instance using '<c>make
+ -j6</c>' or '<c>make -j10</c>'. '<c>make -j</c>' does not
+ work at the moment because of some missing
+ dependencies.</p>
+ <p>
+ Own Id: OTP-9451</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section>
<title>cosTime 1.1.11</title>
<section>
diff --git a/lib/cosTime/vsn.mk b/lib/cosTime/vsn.mk
index 4d982f3013..14d3b61bc6 100644
--- a/lib/cosTime/vsn.mk
+++ b/lib/cosTime/vsn.mk
@@ -1,2 +1,2 @@
-COSTIME_VSN = 1.1.11
+COSTIME_VSN = 1.1.12