diff options
| author | Magnus Lidén <[email protected]> | 2013-09-17 10:22:16 +0200 |
|---|---|---|
| committer | Magnus Lidén <[email protected]> | 2013-09-17 10:22:16 +0200 |
| commit | 5f89a574cb57f94c9d7d45370b5002b1d38147c9 (patch) | |
| tree | faa4a449754c8348a8ef06938f8ffe1246ed0b16 /lib/erl_docgen | |
| parent | 36d4d6fbe37ba9b03a157cdd0e66f3ac28921e0e (diff) | |
| parent | 20641fe0f2ea745873fc7557448d3a7deb1bd639 (diff) | |
| download | otp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.tar.gz otp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.tar.bz2 otp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.zip | |
Merge tag 'OTP_R16B02'
The R16B02 release
Conflicts:
lib/sasl/vsn.mk
Diffstat (limited to 'lib/erl_docgen')
| -rw-r--r-- | lib/erl_docgen/doc/src/notes.xml | 19 | ||||
| -rw-r--r-- | lib/erl_docgen/vsn.mk | 2 |
2 files changed, 19 insertions, 2 deletions
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml index 2ae5f93165..24d12b2bb7 100644 --- a/lib/erl_docgen/doc/src/notes.xml +++ b/lib/erl_docgen/doc/src/notes.xml @@ -30,7 +30,24 @@ </header> <p>This document describes the changes made to the <em>erl_docgen</em> application.</p> - <section><title>Erl_Docgen 0.3.4</title> + <section><title>Erl_Docgen 0.3.4.1</title> + + <section><title>Improvements and New Features</title> + <list> + <item> + <p> + The encoding of the <c>notes.xml</c> file has been + changed from latin1 to utf-8 to avoid future merge + problems.</p> + <p> + Own Id: OTP-11310</p> + </item> + </list> + </section> + +</section> + +<section><title>Erl_Docgen 0.3.4</title> <section><title>Fixed Bugs and Malfunctions</title> <list> diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk index a2262198dc..cda8671cfd 100644 --- a/lib/erl_docgen/vsn.mk +++ b/lib/erl_docgen/vsn.mk @@ -1 +1 @@ -ERL_DOCGEN_VSN = 0.3.4 +ERL_DOCGEN_VSN = 0.3.4.1 |