Merge branch 'next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Apr 2010 22:19:44 +0000 (00:19 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Apr 2010 22:19:44 +0000 (00:19 +0200)
Conflicts:
config/rootfiles/core/37/filelists/files
config/rootfiles/packages/gutenprint
doc/packages-list.txt
src/pakfire/lib/functions.sh

1  2 
config/rootfiles/oldcore/37/update.sh
config/rootfiles/packages/gutenprint
make.sh

Simple merge
Simple merge
diff --cc 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