aboutsummaryrefslogtreecommitdiffstats
path: root/lib/cosFileTransfer
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <egil@erlang.org>2013-06-18 12:04:03 +0200
committerBjörn-Egil Dahlberg <egil@erlang.org>2013-06-18 12:04:03 +0200
commit2b2646d97a0f2248d7ec1be81fb88488cfec9a56 (patch)
treec18a924bdaeeef0f2fd1cf7c9653f02802dc9300 /lib/cosFileTransfer
parent3ed3b7eeb82816a79efda7ff9fd936e4fe5da6d4 (diff)
parent8cece79b77952c991e62ae595bcf71cde016a052 (diff)
downloadotp-2b2646d97a0f2248d7ec1be81fb88488cfec9a56.tar.gz
otp-2b2646d97a0f2248d7ec1be81fb88488cfec9a56.tar.bz2
otp-2b2646d97a0f2248d7ec1be81fb88488cfec9a56.zip
Merge tag 'OTP_R16B01'
The R16B01 release Conflicts: lib/sasl/vsn.mk
Diffstat (limited to 'lib/cosFileTransfer')
-rw-r--r--lib/cosFileTransfer/doc/src/notes.xml17
-rw-r--r--lib/cosFileTransfer/vsn.mk2
2 files changed, 17 insertions, 2 deletions
diff --git a/lib/cosFileTransfer/doc/src/notes.xml b/lib/cosFileTransfer/doc/src/notes.xml
index 385336bffc..5cca5e307b 100644
--- a/lib/cosFileTransfer/doc/src/notes.xml
+++ b/lib/cosFileTransfer/doc/src/notes.xml
@@ -30,7 +30,22 @@
<file>notes.xml</file>
</header>
- <section><title>cosFileTransfer 1.1.14</title>
+ <section><title>cosFileTransfer 1.1.15</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p> Postscript files no longer needed for the generation
+ of PDF files have been removed. </p>
+ <p>
+ Own Id: OTP-11016</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>cosFileTransfer 1.1.14</title>
<section><title>Improvements and New Features</title>
<list>
diff --git a/lib/cosFileTransfer/vsn.mk b/lib/cosFileTransfer/vsn.mk
index 58545be931..cf33926334 100644
--- a/lib/cosFileTransfer/vsn.mk
+++ b/lib/cosFileTransfer/vsn.mk
@@ -1 +1 @@
-COSFILETRANSFER_VSN = 1.1.14
+COSFILETRANSFER_VSN = 1.1.15