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, next has been updated via 117e37e35699860267699b5662516964b59e3eb2 (commit) via 4b492e272b065ae89b17fbf63d2244b0d1d1660e (commit) via a5e8b4b8943c18b715a166c5acafba9b16e9068b (commit) from ea2b3bf4d5033ff99a89d3a5361663837d88aff8 (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 117e37e35699860267699b5662516964b59e3eb2 Merge: 4b492e2 ea2b3bf Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 26 18:09:03 2011 +0200

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit 4b492e272b065ae89b17fbf63d2244b0d1d1660e Merge: a5e8b4b 54c5f69 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 26 18:08:40 2011 +0200

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit a5e8b4b8943c18b715a166c5acafba9b16e9068b Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 26 18:07:56 2011 +0200

Cleanup my mess. This change should be applied with IPFire 2.11.

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

Summary of changes: config/rootfiles/core/50/filelists/files | 1 - config/rootfiles/core/next/filelists/files | 1 + 2 files changed, 1 insertions(+), 1 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files index 0c2ca2c..dca50be 100644 --- a/config/rootfiles/core/50/filelists/files +++ b/config/rootfiles/core/50/filelists/files @@ -1,4 +1,3 @@ -etc/sysctl.conf etc/system-release var/ipfire/langs/ etc/rc.d/init.d/console diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files index 18df107..d645513 100644 --- a/config/rootfiles/core/next/filelists/files +++ b/config/rootfiles/core/next/filelists/files @@ -1,3 +1,4 @@ +etc/sysctl.conf etc/system-release etc/issue srv/web/ipfire/cgi-bin/extrahd.cgi

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