Annoint 1.2.0.

git-svn-id: svn://busybox.net/trunk/busybox@15564 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 12 insertions, 1 deletions

diff --git a/Rules.mak b/Rules.mak
index 310797d8a..61f056661 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -15,7 +15,7 @@ PROG      := busybox
 MAJOR_VERSION   :=1
 MINOR_VERSION   :=2
 SUBLEVEL_VERSION:=0
-EXTRAVERSION    :=-pre0
+EXTRAVERSION    :=
 VERSION   :=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL_VERSION)$(EXTRAVERSION)
 BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
 
diff --git a/docs/busybox.net/news.html b/docs/busybox.net/news.html
index 37f351160..be021da82 100644
--- a/docs/busybox.net/news.html
+++ b/docs/busybox.net/news.html
@@ -2,6 +2,17 @@
 
 
 <ul>
+  <li><b>30 June 2006 -- BusyBox 1.2.0</b>
+    <p>The -devel branch has been stabilized and the result is
+    <a href="http://busybox.net/downloads/busybox-1.2.0.tar.bz2">Busybox
+    1.2.0</a>.  Lots of stuff changed, I need to work up a decent changelog
+    over the weekend.</p>
+
+    <p>I'm still experimenting with how long is best for the development
+    cycle, and since we've got some largeish projects queued up I'm going to
+    try a longer one.  Expect 1.3.0 in December.  (Expect 1.2.1 any time
+    we fix enough bugs. :)</p>
+
   <li><b>17 May 2006 -- BusyBox 1.1.3 (stable)</b>
     <p><a href="http://busybox.net/downloads/busybox-1.1.3.tar.bz2">BusyBox
     1.1.3</a> is another bugfix release.  It makes passwd use salt, fixes a