On Monday 23 September 2013 19:58:08 Martin Graesslin wrote: > > > Switch tasks: > > > > > > * merge the frameworks branch into master > > > > Martin volunteered to do this, planned for next Monday. > > blocked by pre-switch task I just tried to merge master into frameworks-scratch but gave up due to changes in taskmanager where I have no idea how to do the merges.
@Eike: can we try to do that together, tomorrow? Cheers Martin P.S.: this is a clear sign to me that we should split the kde-workspace repo. It would make the merging way easier.
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Plasma-devel mailing list Plasma-devel@kde.org https://mail.kde.org/mailman/listinfo/plasma-devel
