From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 2 Apr 2010 22:19:44 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Tag: v2.9-beta1~412
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=0a8db55873838c67f045d4124f566451019622a8

Merge branch 'next'

Conflicts:
	config/rootfiles/core/37/filelists/files
	config/rootfiles/packages/gutenprint
	doc/packages-list.txt
	src/pakfire/lib/functions.sh
---

0a8db55873838c67f045d4124f566451019622a8
diff --cc make.sh
index 40a9e4b02e,7121005e77..9c7369c742
--- a/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
- VERSION="2.5"							# Version number
- CORE="37"							# Core Level (Filename)
+ VERSION="2.6"							# Version number
 -CORE="37"							# Core Level (Filename)
 -PAKFIRE_CORE="36"						# Core Level (PAKFIRE)
++CORE="38"							# Core Level (Filename)
 +PAKFIRE_CORE="37"						# Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
  SLOGAN="www.ipfire.org"						# Software slogan
  CONFIG_ROOT=/var/ipfire						# Configuration rootdir