From: Christian Schmidt <christian.schmidt@ipfire.org>
Date: Sun, 2 May 2010 20:19:18 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-beta1~337
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=bc3e1b292534d100ed2ee3fc29b6c56d556ba3d5;hp=51d002bdef1b032bdb23c1591e05d27e22c895fc

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
---

diff --git a/make.sh b/make.sh
index 693a818b46..9aa1aca80d 100755
--- a/make.sh
+++ b/make.sh
@@ -650,7 +650,7 @@ buildipfire() {
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
   echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
-  if [ "$GIT_BRANCH" = "next" ]; then
+  if [ "$GIT_BRANCH" = "master" ]; then
 	echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
   else
 	echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release