From: John Bowler <jbowler@nslu2-linux.org>
Date: Fri, 27 May 2005 23:36:54 +0000 (+0000)
Subject: Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~14072
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37b5eb3d53248d7f17b89a480f610722bdf9e0f5;p=openembedded.git

Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into  marsco.kalmiopsis:/home/nslu2/openembedded

2005/05/27 16:36:03-07:00 kalmiopsis!jbowler
Put the DISTRO_VERSION back.
(Only change at release).

BKrev: 4297af16dYXoQtM_qePrGhmklRhSEw
---

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 5ab025e8f9..fbbacd2839 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
 
 DISTRO_NAME = "OpenSlug"
-DISTRO_VERSION = "1.20-pre1"
+DISTRO_VERSION = "1.12-beta"
 DISTRO_TYPE ?= "beta"
 
 TARGET_FPU_local ?= "soft"