[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 71f51934d73bc5d252a46776cbb9ce76a5398fb3

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 71f51934d73bc5d252a46776cbb9ce76a5398fb3

[git]

[-- Attachment #1: Type: text/plain, Size: 3145 bytes --]

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, fifteen has been updated
       via  71f51934d73bc5d252a46776cbb9ce76a5398fb3 (commit)
       via  8298e1ddc3089e21d3643199148b558be6716079 (commit)
       via  632e0a3e5ecad92110fcb114bfa20e607b853dcb (commit)
      from  1ad5c2fa0713024dce7c14c7b5bd008e3f128cf3 (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 71f51934d73bc5d252a46776cbb9ce76a5398fb3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Dec 23 15:18:47 2013 +0100

    fifteen: Add url-filter.cgi to updater.
    
    This file has been updated for core update 73,
    but unfortunately was forgotten to be put into the
    updater.

commit 8298e1ddc3089e21d3643199148b558be6716079
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Dec 23 15:18:12 2013 +0100

    fifteen: Add credits.cgi to core update.

commit 632e0a3e5ecad92110fcb114bfa20e607b853dcb
Author: Alexander Marx <amarx(a)ipfire.org>
Date:   Mon Dec 23 15:14:25 2013 +0100

    Firewall: added amarx to credits.cgi

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

Summary of changes:
 config/rootfiles/core/fifteen/filelists/files | 2 ++
 html/cgi-bin/credits.cgi                      | 2 ++
 2 files changed, 4 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/fifteen/filelists/files b/config/rootfiles/core/fifteen/filelists/files
index 6a299d4..ac4f298 100644
--- a/config/rootfiles/core/fifteen/filelists/files
+++ b/config/rootfiles/core/fifteen/filelists/files
@@ -1,12 +1,14 @@
 etc/system-release
 etc/issue
 etc/rc.d/init.d/network
+srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/netinternal.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/upnp.cgi
 srv/web/ipfire/cgi-bin/speed.cgi
+srv/web/ipfire/cgi-bin/url-filter.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 srv/web/ipfire/html/themes/ipfire/include/functions.pl
 srv/web/ipfire/html/themes/maniac/include/functions.pl
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index d61019e..2d113c4 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -68,6 +68,8 @@ Christian Schmidt
 (<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\@ipfire.org</a>) - Vice Project Leader <br />
 Stefan Schantl
 (<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\@ipfire.org</a>)<br />
+Alexander Marx
+(<a href='mailto:alexander.marx\@ipfire.org'>alexander.marx\@ipfire.org</a>)<br />
 Heiner Schmeling
 (<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\@ipfire.org</a>)<br />
 Ronald Wiesinger


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