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 a3f7164f985b1af190e18f45c1d86ad59bd671d3 (commit) via 7cc4cbaae0196f14167a86ddccb1f1c9b4ca3b37 (commit) from 68a3b9024c029f61d30f94b84fe723f6431dfe44 (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 a3f7164f985b1af190e18f45c1d86ad59bd671d3 Merge: 7cc4cba 68a3b90 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Dec 9 19:25:03 2011 +0100

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

commit 7cc4cbaae0196f14167a86ddccb1f1c9b4ca3b37 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Dec 9 19:23:57 2011 +0100

core54: add snort.conf to updater

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

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

Difference in files: diff --git a/config/rootfiles/core/54/filelists/files b/config/rootfiles/core/54/filelists/files index 318c8cb..ff13db6 100644 --- a/config/rootfiles/core/54/filelists/files +++ b/config/rootfiles/core/54/filelists/files @@ -1,5 +1,6 @@ etc/system-release etc/issue +etc/snort/snort.conf var/ipfire/langs usr/share/hwdata/pci.ids usr/share/hwdata/usb.ids

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