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 416bf5f3f9c24b5b7e57d07e5aec0cbff1e249a6 (commit) from 61466ab18dff0dc9809578f2e5d810a6a16d9aa4 (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 416bf5f3f9c24b5b7e57d07e5aec0cbff1e249a6 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Sep 29 13:44:26 2014 +0200

fix merge problem.

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

Summary of changes: config/rootfiles/{core => oldcore}/82/filelists/iputils | 0 config/rootfiles/{core => oldcore}/82/filelists/openssl-compat | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename config/rootfiles/{core => oldcore}/82/filelists/iputils (100%) rename config/rootfiles/{core => oldcore}/82/filelists/openssl-compat (100%)

Difference in files: diff --git a/config/rootfiles/core/82/filelists/iputils b/config/rootfiles/core/82/filelists/iputils deleted file mode 120000 index 361c28f..0000000 --- a/config/rootfiles/core/82/filelists/iputils +++ /dev/null @@ -1 +0,0 @@ -../../../common/iputils \ No newline at end of file diff --git a/config/rootfiles/core/82/filelists/openssl-compat b/config/rootfiles/core/82/filelists/openssl-compat deleted file mode 120000 index c9fa421..0000000 --- a/config/rootfiles/core/82/filelists/openssl-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/oldcore/82/filelists/iputils b/config/rootfiles/oldcore/82/filelists/iputils new file mode 120000 index 0000000..361c28f --- /dev/null +++ b/config/rootfiles/oldcore/82/filelists/iputils @@ -0,0 +1 @@ +../../../common/iputils \ No newline at end of file diff --git a/config/rootfiles/oldcore/82/filelists/openssl-compat b/config/rootfiles/oldcore/82/filelists/openssl-compat new file mode 120000 index 0000000..c9fa421 --- /dev/null +++ b/config/rootfiles/oldcore/82/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file

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