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 325a846a10e80385e12f08c72bfda19690c0aa5d (commit) via 7ae2d8a2a4448ae06437fd80e794c00a4303f56e (commit) from 12f74b8f919f264e24778c9d31dc74cd90a82cda (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 325a846a10e80385e12f08c72bfda19690c0aa5d Merge: 7ae2d8a 12f74b8 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 21 14:24:29 2015 +0100

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

commit 7ae2d8a2a4448ae06437fd80e794c00a4303f56e Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 21 14:24:06 2015 +0100

util-linux: Ship tailf

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

Summary of changes: config/rootfiles/common/armv5tel/util-linux | 2 +- config/rootfiles/common/i586/util-linux | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/rootfiles/common/armv5tel/util-linux b/config/rootfiles/common/armv5tel/util-linux index 0f36409..2675dd0 100644 --- a/config/rootfiles/common/armv5tel/util-linux +++ b/config/rootfiles/common/armv5tel/util-linux @@ -74,7 +74,7 @@ usr/bin/renice #usr/bin/setarch usr/bin/setsid #usr/bin/setterm -#usr/bin/tailf +usr/bin/tailf #usr/bin/taskset #usr/bin/ul #usr/bin/unshare diff --git a/config/rootfiles/common/i586/util-linux b/config/rootfiles/common/i586/util-linux index 34c87f2..9b8d484 100644 --- a/config/rootfiles/common/i586/util-linux +++ b/config/rootfiles/common/i586/util-linux @@ -75,7 +75,7 @@ usr/bin/renice #usr/bin/setarch usr/bin/setsid #usr/bin/setterm -#usr/bin/tailf +usr/bin/tailf #usr/bin/taskset #usr/bin/ul #usr/bin/unshare

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