Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7bfa06254ad8ea05b2d40862a763a8a180d4d772)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Andraž 'ruskie' Levstik" <ruskie AT codemages.net>
  • To: <sm-commit AT lists.ibiblio.org>
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7bfa06254ad8ea05b2d40862a763a8a180d4d772)
  • Date: Fri, 11 Apr 2008 20:00:28 +0200

On 19:07:19 2008-04-11 Treeve Jelbert <scm AT sourcemage.org> wrote:
> GIT changes to master grimoire by Treeve Jelbert
> <treeve AT sourcemage.org>:
>
> ChangeLog | 3 +++
> dev/null |binary
> python-pypi/sqlalchemy/DETAILS | 4 ++--
> python-pypi/sqlalchemy/HISTORY | 3 +++
> x11-libs/cairo/DEPENDS | 1 +
> x11-libs/cairo/DETAILS | 5 +++--
> x11-libs/cairo/HISTORY | 4 ++++
> x11-libs/cairo/cairo-1.4.14.tar.gz.sig | 0
> x11-libs/pixman/DEPENDS | 1 +
> x11-libs/pixman/DETAILS | 13 +++++++++++++
> x11-libs/pixman/HISTORY | 10 ++++++++++
> x11-libs/pixman/INSTALL | 11 +++++++++++
> 12 files changed, 51 insertions(+), 4 deletions(-)
>
> New commits:
> commit 7c155f02c773b44743b9ac2b0f85a4b1bf17d019
> Author: Treeve Jelbert <treeve AT sourcemage.org>
> Commit: Treeve Jelbert <treeve AT sourcemage.org>
>
> pixman-0.10.0
>

You're supposed to cherry-pick the spell over from the modular-branch...
not add a new instance of the spell. This will cause issues further down
the line with merging.

See: http://www.sourcemage.org/Git_Guide on cherry-picking

--
Andraž "ruskie" Levstik
Source Mage GNU/Linux Games grimoire guru
Geek/Hacker/Tinker

Be sure brain is in gear before engaging mouth.

Key id = F4C1F89C
Key fingerprint = 6FF2 8F20 4C9D DB36 B5B6 F134 884D 72CC F4C1 F89C





Archive powered by MHonArc 2.6.24.

Top of Page