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 24f1f6ce6104b1b7afdef9caa7140d704f23d1c8 (commit) via d4e6e4ce5d57707e9e36b53ecf9106f88a707ec4 (commit) via ce916ba73cc3ccb52eb30110483209612cfcb13c (commit) from 9aa36230a5d5001b10a78cc74a9661c8ac000e1d (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 24f1f6ce6104b1b7afdef9caa7140d704f23d1c8 Merge: d4e6e4c 9aa3623 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Nov 28 21:01:11 2010 +0100

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

Conflicts: config/rootfiles/packages/miniupnpd

commit d4e6e4ce5d57707e9e36b53ecf9106f88a707ec4 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Nov 28 21:00:28 2010 +0100

fireinfo: New version: 0.3.

commit ce916ba73cc3ccb52eb30110483209612cfcb13c Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Nov 27 23:54:30 2010 +0100

Update rootfile of miniupnpd.

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

Summary of changes: config/rootfiles/packages/miniupnpd | 4 ++-- lfs/fireinfo | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

Difference in files: diff --git a/config/rootfiles/packages/miniupnpd b/config/rootfiles/packages/miniupnpd index cd3c612..cdad3be 100644 --- a/config/rootfiles/packages/miniupnpd +++ b/config/rootfiles/packages/miniupnpd @@ -1,6 +1,6 @@ +etc/miniupnpd +etc/miniupnpd/miniupnpd.conf etc/rc.d/init.d/miniupnpd etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.up/10-miniupnpd -etc/miniupnpd -etc/miniupnpd/miniupnpd.conf usr/sbin/miniupnpd diff --git a/lfs/fireinfo b/lfs/fireinfo index d898a39..a0aafbf 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -24,7 +24,7 @@

include Config

-VER = 0.2 +VER = 0.3

THISAPP = fireinfo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 30870d3a8f9d47611efc148a76a5b87f +$(DL_FILE)_MD5 = 2105bf88213dfd2198891a96eeb08949

install : $(TARGET)

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