'Re: meeting notes'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-kimageshop
Subject:    Re: meeting notes
From:       Silvio Heinrich <plassy () web ! de>
Date:       2011-04-07 12:35:31
Message-ID: 4D9DAF93.9010701 () web ! de
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]

On 04/07/2011 02:16 PM, Boudewijn Rempt wrote:
>
> > For the blending modes there is already a new ordering (in the branch
>
> > krita-blendingmodes-silvioheinrich) that should be similar to yours.
>
> > But you cannot merge the branch yourself (unless you know what you do
>
> > :P) because it will result in conflicts... so you cannot try out.
>
> >
>
> > I'll try to get the blending-modes branch merged
>
>
> Aw! I thought that that was already merged!
>
>
:P would be nice... but no.
Today i will push another branch in preparation for the blending-modes 
merge, and i hope this will satisfy Cyrille :)
I hope all problems will be solved then...

[Attachment #5 (text/html)]

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
  <head>
    <meta content="text/html; charset=ISO-8859-15"
      http-equiv="Content-Type">
  </head>
  <body bgcolor="#ffffff" text="#000000">
    On 04/07/2011 02:16 PM, Boudewijn Rempt wrote:
    <blockquote cite="mid:201104071416.21706.boud@valdyas.org"
      type="cite">
      <meta name="qrichtext" content="1">
      <style type="text/css">
p, li { white-space: pre-wrap; }</style>
      <p style="margin: 0px; text-indent: 0px;">&gt; For the blending
        modes there is already a new ordering (in the branch </p>
      <p style="margin: 0px; text-indent: 0px;">&gt;
        krita-blendingmodes-silvioheinrich) that should be similar to
        yours.</p>
      <p style="margin: 0px; text-indent: 0px;">&gt; But you cannot
        merge the branch yourself (unless you know what you do </p>
      <p style="margin: 0px; text-indent: 0px;">&gt; :P) because it will
        result in conflicts... so you cannot try out.</p>
      <p style="margin: 0px; text-indent: 0px;">&gt; </p>
      <p style="margin: 0px; text-indent: 0px;">&gt; I'll try to get the
        blending-modes branch merged</p>
      <p style="margin: 0px; text-indent: 0px;"><br>
      </p>
      <p style="margin: 0px; text-indent: 0px;">Aw! I thought that that
        was already merged!</p>
      <br>
    </blockquote>
    :P would be nice... but no.<br>
    Today i will push another branch in preparation for the
    blending-modes merge, and i hope this will satisfy Cyrille :)<br>
    I hope all problems will be solved then...<br>
  </body>
</html>

_______________________________________________
kimageshop mailing list
kimageshop@kde.org
https://mail.kde.org/mailman/listinfo/kimageshop

[prev in list] [next in list] [prev in thread] [next in thread] 