OK, I deleted the old merge request and created a new one. Hopefully this will merge more cleanly!<br><br><div class="gmail_quote">On Thu, Sep 3, 2009 at 1:53 AM, Nikolaj Hald Nielsen <span dir="ltr"><<a href="mailto:nhnfreespirit@gmail.com">nhnfreespirit@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">Tim<br>
<br>
I just tried your patch (merging your repo) and it causes a few<br>
conflicts with current master. Could you please rebase and fix the<br>
conflicts? Then I will be happy to push this to master (after a bit of<br>
testing)<br>
<font color="#888888"><br>
- Nikolaj<br>
</font><div><div></div><div class="h5"><br>
On Thu, Sep 3, 2009 at 12:25 AM, Ian Monroe<<a href="mailto:ian.monroe@gmail.com">ian.monroe@gmail.com</a>> wrote:<br>
> On Wed, Sep 2, 2009 at 4:49 PM, Tim Bocek<<a href="mailto:tim.bocek@gmail.com">tim.bocek@gmail.com</a>> wrote:<br>
>> I just finished a patch that implements tying grouping schemes to playlist<br>
>> layouts, and created a merge request at:<br>
>><br>
>> <a href="http://www.gitorious.org/amarok/amarok/merge_requests/1415" target="_blank">http://www.gitorious.org/amarok/amarok/merge_requests/1415</a><br>
>><br>
>> If this is too much given the state of the freeze (it does add some extra<br>
>> strings), I'm happy to just let this sit until 2.2.1.<br>
><br>
> Also meant to mention: delete the commented out code. Commented code<br>
> is confusing and pointless.<br>
><br>
> Ian<br>
> _______________________________________________<br>
> Amarok mailing list<br>
> <a href="mailto:Amarok@kde.org">Amarok@kde.org</a><br>
> <a href="https://mail.kde.org/mailman/listinfo/amarok" target="_blank">https://mail.kde.org/mailman/listinfo/amarok</a><br>
><br>
_______________________________________________<br>
Amarok mailing list<br>
<a href="mailto:Amarok@kde.org">Amarok@kde.org</a><br>
<a href="https://mail.kde.org/mailman/listinfo/amarok" target="_blank">https://mail.kde.org/mailman/listinfo/amarok</a><br>
</div></div></blockquote></div><br>