[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0e46fd59368d536db566cba4a6796e2c5d814746

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0e46fd59368d536db566cba4a6796e2c5d814746

[git]

[-- Attachment #1: Type: text/plain, Size: 2405 bytes --]

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  0e46fd59368d536db566cba4a6796e2c5d814746 (commit)
       via  52071035c62ef92c1ba3872be059d4b631cfe20d (commit)
       via  3c6c5e4a3f18bf7e58517283d3f436b47b8bcb0f (commit)
      from  966306c72529c88a39dc3d9ad031e725b90d5de3 (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 0e46fd59368d536db566cba4a6796e2c5d814746
Merge: 966306c 5207103
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun May 20 11:58:10 2012 +0200

    Merge remote-tracking branch 'stevee/armv5tel-xorg-x11-server'
    
    Conflicts:
    	xorg-x11-server/xorg-x11-server.nm

commit 52071035c62ef92c1ba3872be059d4b631cfe20d
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Tue May 8 21:56:37 2012 +0200

    xorg-x11-server: Readd removed runtime dependencies from last commit.
    
    Readd removed dependencies after successfull build on armv5tel.

commit 3c6c5e4a3f18bf7e58517283d3f436b47b8bcb0f
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Tue May 8 21:53:43 2012 +0200

    xorg-x11-server: Temporary remove some runtime dependencies.
    
    Temporary remove the following runtime deps to allow building
    on armv5tel:
    
    	- xorg-x11-drv-evdev
    	- xorg-x11-drv-keyboard
    	- xorg-x11-drv-mouse
    	- xorg-x11-drv-vesa

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

Summary of changes:
 xorg-x11-server/xorg-x11-server.nm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Difference in files:
diff --git a/xorg-x11-server/xorg-x11-server.nm b/xorg-x11-server/xorg-x11-server.nm
index 2506574..365c9e6 100644
--- a/xorg-x11-server/xorg-x11-server.nm
+++ b/xorg-x11-server/xorg-x11-server.nm
@@ -5,7 +5,7 @@
 
 name       = xorg-x11-server
 version    = 1.8.2
-release    = 5.1
+release    = 6
 
 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
 groups     = X/Server


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