summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-06-30 22:40:13 +0000
committerRob Landley <rob@landley.net>2006-06-30 22:40:13 +0000
commit01772aea33bb2888d9b2799263313cad9795ca32 (patch)
tree93ea581203f2c1d7d62133880db439ce009c4fed
parent12d9419273c04dcdf2557f0263d69633c60b6a60 (diff)
downloadbusybox-w32-01772aea33bb2888d9b2799263313cad9795ca32.tar.gz
busybox-w32-01772aea33bb2888d9b2799263313cad9795ca32.tar.bz2
busybox-w32-01772aea33bb2888d9b2799263313cad9795ca32.zip
Annoint 1.2.0.
-rw-r--r--Rules.mak2
-rw-r--r--docs/busybox.net/news.html11
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
15MAJOR_VERSION :=1 15MAJOR_VERSION :=1
16MINOR_VERSION :=2 16MINOR_VERSION :=2
17SUBLEVEL_VERSION:=0 17SUBLEVEL_VERSION:=0
18EXTRAVERSION :=-pre0 18EXTRAVERSION :=
19VERSION :=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL_VERSION)$(EXTRAVERSION) 19VERSION :=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL_VERSION)$(EXTRAVERSION)
20BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z") 20BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
21 21
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 @@
2 2
3 3
4<ul> 4<ul>
5 <li><b>30 June 2006 -- BusyBox 1.2.0</b>
6 <p>The -devel branch has been stabilized and the result is
7 <a href="http://busybox.net/downloads/busybox-1.2.0.tar.bz2">Busybox
8 1.2.0</a>. Lots of stuff changed, I need to work up a decent changelog
9 over the weekend.</p>
10
11 <p>I'm still experimenting with how long is best for the development
12 cycle, and since we've got some largeish projects queued up I'm going to
13 try a longer one. Expect 1.3.0 in December. (Expect 1.2.1 any time
14 we fix enough bugs. :)</p>
15
5 <li><b>17 May 2006 -- BusyBox 1.1.3 (stable)</b> 16 <li><b>17 May 2006 -- BusyBox 1.1.3 (stable)</b>
6 <p><a href="http://busybox.net/downloads/busybox-1.1.3.tar.bz2">BusyBox 17 <p><a href="http://busybox.net/downloads/busybox-1.1.3.tar.bz2">BusyBox
7 1.1.3</a> is another bugfix release. It makes passwd use salt, fixes a 18 1.1.3</a> is another bugfix release. It makes passwd use salt, fixes a