Update for 2014.05

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

4 files changed, 27 insertions, 8 deletions

diff --git a/CHANGES b/CHANGES
index e5b416cd4f..5b7729265a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+2014.05, Released May 31st, 2014
+
+	Minor fixes.
+
+	Minor manual fixes. U-Boot now defaults to spl/u-boot-spl.bin
+	for the spl file.
+
+	Updated/fixed packages: exim, glibc, gnutls, libfribidi,
+	qt5base, qt5webkit, sysklogd, thrift, u-boot
+
 2014.05-rc3, Released May 28th, 2014
 
 	Minor fixes.
diff --git a/Makefile b/Makefile
index 8ccfbd8973..a2681f612d 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION := 2014.05-rc3
+export BR2_VERSION := 2014.05
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION = 3.81
diff --git a/docs/download.html b/docs/download.html
index e77338ce3c..da58068a7b 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -4,17 +4,17 @@
 
 <p>
 
-The latest stable release is <b>2014.02</b>, which can be downloaded
+The latest stable release is <b>2014.05</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2014.02.tar.gz">buildroot-2014.02.tar.gz</a>
-(<a href="/downloads/buildroot-2014.02.tar.gz.sign">PGP signature</a>)
+<a href="/downloads/buildroot-2014.05.tar.gz">buildroot-2014.05.tar.gz</a>
+(<a href="/downloads/buildroot-2014.05.tar.gz.sign">PGP signature</a>)
 or
-<a href="/downloads/buildroot-2014.02.tar.bz2">buildroot-2014.02.tar.bz2</a>
-(<a href="/downloads/buildroot-2014.02.tar.bz2.sign">PGP signature</a>).
+<a href="/downloads/buildroot-2014.05.tar.bz2">buildroot-2014.05.tar.bz2</a>
+(<a href="/downloads/buildroot-2014.05.tar.bz2.sign">PGP signature</a>).
 
 <p>
-
+<!--
 The latest release candidate is <b>2014.05-rc3</b>, which can be
 downloaded here:<p>
 
@@ -29,7 +29,7 @@ This and earlier releases (and their PGP signatures) can always be downloaded fr
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
 <p>
-
+-->
 You can also obtain <a href="/downloads/snapshots/">Daily
 Snapshots</a> of the latest Buildroot source tree if you want to to
 follow development, but cannot or do not wish to use Git.
diff --git a/docs/news.html b/docs/news.html
index 21efa38f93..b1fdcb19c0 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -6,6 +6,15 @@
 
 <ul>
 
+  <li><b>31 May 2014 -- 2014.05 released</b>
+
+    <p>The stable 2014.05 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2014.05">CHANGES</a>
+    file for more details,
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2014.05.tar.bz2">2014.05 release</a>.</p>
+
   <li><b>28 May 2014 -- 2014.05-rc3 released</b>
 
     <p>Release candidate 3 is out with more cleanups and build fixes. See the <a