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 3.x development tree".

The branch, master has been updated via f04fab17712a4872e85e915bb689b2177b0763d3 (commit) via d5782688c91916bf772b10873459c79fb5b978e3 (commit) via 6ce6f4eaa02d4a94b61501a6c554ff07fd6cbdac (commit) via 683b83676538348d67d49b21be58eee6d14f7450 (commit) from 22ab87796b5d4cda1eb0c75f3aacde77495376ab (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 f04fab17712a4872e85e915bb689b2177b0763d3 Merge: d578268 22ab877 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 20 15:58:26 2011 +0200

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

commit d5782688c91916bf772b10873459c79fb5b978e3 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 20 13:13:48 2011 +0200

pixman: Remove some dead code.

commit 6ce6f4eaa02d4a94b61501a6c554ff07fd6cbdac Merge: 683b836 0423471 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 20 13:10:28 2011 +0200

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

commit 683b83676538348d67d49b21be58eee6d14f7450 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 6 12:30:55 2011 +0200

Remove package bootchart2.

This feature is covered by systemd.

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

Summary of changes: pkgs/pixman/pixman.nm | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-)

Difference in files: diff --git a/pkgs/pixman/pixman.nm b/pkgs/pixman/pixman.nm index 1a67ead..53d7d15 100644 --- a/pkgs/pixman/pixman.nm +++ b/pkgs/pixman/pixman.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = pixman PKG_VER = 0.18.4 -PKG_REL = 1 +PKG_REL = 2

PKG_MAINTAINER = PKG_GROUPS = System/Libraries @@ -43,14 +43,3 @@ endef PKG_TARBALL = $(THISAPP).tar.gz

PKG_PACKAGES += $(PKG_NAME)-devel - -# XXX double check this later on -ifeq "$(TARGET)" "via-c7" - CONFIGURE_OPTIONS += --enable-mmx #--enable-sse2 -else -ifeq "$(TARGET)" "atom" - CONFIGURE_OPTIONS += --enable-mmx --enable-sse2 -else - CONFIGURE_OPTIONS += --disable-mmx --disable-sse2 -endif -endif

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