From 9a81b28598fadc44bf506354c9227e41aac786f6 Mon Sep 17 00:00:00 2001
From: Henrik Nord <henrik@erlang.org>
Date: Wed, 13 May 2015 09:40:16 +0200
Subject: Revert "Prepare release"

This reverts commit e09dd66dc4d89c62ddfd8c19791f9678d5d787c6.
---
 lib/compiler/doc/src/notes.xml | 88 ------------------------------------------
 lib/compiler/vsn.mk            |  2 +-
 2 files changed, 1 insertion(+), 89 deletions(-)

(limited to 'lib/compiler')

diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 0654738247..9b5b44f3e1 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -31,94 +31,6 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
-<section><title>Compiler 6.0</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    The compiler optimizes away building of terms that are
-	    never actually used. As a result, the compiler in OTP 18
-	    may produce more warnings for terms that are built but
-	    not used than the compiler in OTP 17.</p>
-          <p>
-	    Own Id: OTP-12453</p>
-        </item>
-        <item>
-          <p>
-	    Using a map could incorrectly suppress warnings for
-	    unused variables.</p>
-          <p>
-	    Own Id: OTP-12515</p>
-        </item>
-        <item>
-          <p>
-	    The compiler now properly reports unknown parse
-	    transforms. That is, <c>undef</c> exceptions coming from
-	    the parse transform itself is reported differently from
-	    the absence of the parse transform.</p>
-          <p>
-	    Own Id: OTP-12723</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The <c>cerl</c> and <c>cerl_trees</c> modules in the
-	    <c>compiler</c> application are now documented.</p>
-          <p>
-	    Own Id: OTP-11978</p>
-        </item>
-        <item>
-          <p>
-	    The deprecated '<c>asm</c>' option has been removed.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-12100</p>
-        </item>
-        <item>
-          <p>
-	    Support variables as Map keys in expressions and patterns</p>
-	    <p>Erlang will accept any expression as keys in Map
-	    expressions and it will accept literals or bound
-	    variables as keys in Map patterns.</p>
-          <p>
-	    Own Id: OTP-12218</p>
-        </item>
-        <item>
-          <p>
-	    Infer Map type information in beam_type compiler
-	    optimization pass.</p>
-          <p>
-	    Own Id: OTP-12253</p>
-        </item>
-        <item>
-          <p>
-	    Compiler optimizations have been improved.</p>
-          <p>
-	    Own Id: OTP-12393</p>
-        </item>
-        <item>
-          <p>
-	    Five undocumented functions in the module <c>core_lib</c>
-	    have been deprecated and will be removed in the next
-	    major release. The functions are: <c>get_anno/{1,2}</c>,
-	    <c>is_literal/1</c>, <c>is_literal_list/1</c>, and
-	    <c>literal_value</c>. Use the appropriate functions in
-	    the <c>cerl</c> module instead.</p>
-          <p>
-	    Own Id: OTP-12497</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Compiler 5.0.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index 69f71ba5dd..05e682c893 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 6.0
+COMPILER_VSN = 5.0.4
-- 
cgit v1.2.3