Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (15694212fbf88dd02eb5a344b30bf3738a9a9a0b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <ladislav.hagara AT unob.cz>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (15694212fbf88dd02eb5a344b30bf3738a9a9a0b)
  • Date: Thu, 12 Apr 2012 15:48:48 +0200

> GIT changes to master grimoire by Florian Franzmann
> <siflfran AT hawo.stw.uni-erlangen.de>:
>
> xorg-lib/pixman/DETAILS | 4 ++--
> xorg-lib/pixman/HISTORY | 3 +++
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
> New commits:
> commit db9a14c641549e8283e1d464541a141142e6b9e3
> Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
> Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
>
> xorg-lib/pixman: version 0.24.4
>
> diff --git a/xorg-lib/pixman/DETAILS b/xorg-lib/pixman/DETAILS
> index ae6ab8a..993bdb5 100755
> --- a/xorg-lib/pixman/DETAILS
> +++ b/xorg-lib/pixman/DETAILS
> @@ -1,6 +1,6 @@
> SPELL=pixman
> - VERSION=0.20.2
> -
> SOURCE_HASH=sha512:507dc4738df6ee49298e296dd3a95030dda7da27f60d9fa5ba025e299c864db6f4fd3041c7c347e4dfe677ec11c2ae6180622aff37bc0923f839dedfde606688
> + VERSION=0.24.4
> +
> SOURCE_HASH=sha512:86a0581258014f665223007261e136dbf3e1306d0331c6dc6e2951d96714de9f2bc8ae404f35acd4d867a537ebf28a1bcb5ee6ef1999e4a23eb9f16333cf3dc9
> SOURCE=$SPELL-$VERSION.tar.bz2
> SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
>
> SOURCE_URL[1]=http://xorg.freedesktop.org/releases/individual/lib/$SOURCE
> diff --git a/xorg-lib/pixman/HISTORY b/xorg-lib/pixman/HISTORY
> index 56114c9..07ccc9d 100644
> --- a/xorg-lib/pixman/HISTORY
> +++ b/xorg-lib/pixman/HISTORY
> @@ -1,3 +1,6 @@
> +2012-04-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
> + * DETAILS: version 0.24.4



I reverted this.
We already have pixman 0.24.4 in devel-xorg branch.
We all shoud cherry-pick commits from devel branches if they have been
already updated.
With these repeated commits we only create more conflicts between
branches as we already have.

Imho.

--
Ladislav Hagara




Archive powered by MHonArc 2.6.24.

Top of Page