This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 765123255d98db6f03aa5bf5a91875df360012ed (commit) via 969bf25a6dd741ea388ebccea4b103554d2f57ac (commit) from 11c96d4a74cf1af60c377b8a0a83c53141777d15 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 765123255d98db6f03aa5bf5a91875df360012ed Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Mar 18 09:24:31 2011 +0100

Finish core48.

commit 969bf25a6dd741ea388ebccea4b103554d2f57ac Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Mar 18 09:19:19 2011 +0100

pppsetup.cgi: change headline from IPTV to IPTV/VLAN.

-----------------------------------------------------------------------

Summary of changes: html/cgi-bin/pppsetup.cgi | 4 ++-- make.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

Difference in files: diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 6205d2f..f6b29e1 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -748,7 +748,7 @@ END if ($pppsettings{'TYPE'} =~ /^(pppoe|vdsl|pppoeatm)$/) { print <<END <tr> - <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>IPTV:</b></td> + <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>IPTV/VLAN:</b></td> </tr> END ; @@ -777,6 +777,7 @@ END ; } else { + print "<tr><td colspan='4' width='100%'>No IPTV possible install addon igmpproxy</td></tr>"; if ($pppsettings{'TYPE'} eq 'vdsl') { print <<END <tr> @@ -786,7 +787,6 @@ print <<END END ; } - print "<tr><td colspan='4' width='100%'>No IPTV possible install addon igmpproxy</td></tr>"; } }

diff --git a/make.sh b/make.sh index 55bdf9a..a05cfbc 100755 --- a/make.sh +++ b/make.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# Copyright (C) 2007-2011 IPFire-Team info@ipfire.org. # # # ############################################################################ # @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number CORE="48" # Core Level (Filename) -PAKFIRE_CORE="47" # Core Level (PAKFIRE) +PAKFIRE_CORE="48" # 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

hooks/post-receive -- IPFire 2.x development tree