CHANGES: update with changes from for-2010.08 branch

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

2 files changed, 19 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index 09efdb09c..ccc6a52af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,21 @@
+2010.08, Not released yet:
+
+	Fixes all over the tree.
+
+	Mark the combination of uClibc 0.9.31, gcc 4.2.x, C++ and
+	locale support as broken.
+
+	Mark CRIS architecture as deprecated, as it is discontinued
+	upstream.
+
+	Updated/fixed packages: busybox, imagemagick, libglib2, lua,
+	luafilesystem, lzo, netcat, php, sysvinit, util-linux
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#635:  util-linux fails to build in 2009.08
+	#2239: netcat package installs its binary to target as avr32-linux...
+
 2010.08-rc1, Released July 30th, 2010:
 
 	Fixes all over the tree and new features.
diff --git a/Config.in b/Config.in
index bcf9feb10..52ea6d60a 100644
--- a/Config.in
+++ b/Config.in
@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG
 
 config BR2_VERSION
 	string
-	default "2010.08-rc1"
+	default "2010.08-rc1-git"
 
 source "target/Config.in.arch"
 source "target/device/Config.in"