aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools
diff options
context:
space:
mode:
authorMagnus Lidén <[email protected]>2013-09-17 10:22:16 +0200
committerMagnus Lidén <[email protected]>2013-09-17 10:22:16 +0200
commit5f89a574cb57f94c9d7d45370b5002b1d38147c9 (patch)
treefaa4a449754c8348a8ef06938f8ffe1246ed0b16 /lib/tools
parent36d4d6fbe37ba9b03a157cdd0e66f3ac28921e0e (diff)
parent20641fe0f2ea745873fc7557448d3a7deb1bd639 (diff)
downloadotp-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/tools')
-rw-r--r--lib/tools/doc/src/notes.xml31
-rw-r--r--lib/tools/vsn.mk2
2 files changed, 32 insertions, 1 deletions
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index 422d4538a6..d8239460b3 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -30,6 +30,37 @@
</header>
<p>This document describes the changes made to the Tools application.</p>
+<section><title>Tools 2.6.12</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Remove trailing spaces in Emacs templates. Thanks to
+ Roberto Aloi.</p>
+ <p>
+ Own Id: OTP-11198</p>
+ </item>
+ <item>
+ <p>
+ Fixed the Emacs erlang-mode to accommodate the coding
+ style where lists written across several lines have each
+ line starting with a comma. Thanks to Magnus Henoch.</p>
+ <p>
+ Own Id: OTP-11242</p>
+ </item>
+ <item>
+ <p>
+ Make the Emacs Erlang mode TRAMP-aware when compiling.
+ Thanks to Tomas Abrahamsson.</p>
+ <p>
+ Own Id: OTP-11270</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Tools 2.6.11</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index a30b16fc49..c51b833dd0 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 2.6.11
+TOOLS_VSN = 2.6.12