From calligra-devel Fri Mar 16 18:36:24 2012 From: Marijn Kruisselbrink Date: Fri, 16 Mar 2012 18:36:24 +0000 To: calligra-devel Subject: Re: calligra/2.4 build fails Message-Id: <201203161936.25640.mkruisselbrink () kde ! org> X-MARC-Message: https://marc.info/?l=calligra-devel&m=133192305607359 On Friday, March 16, 2012 10:14:24 AM Boudewijn Rempt wrote: > On Friday 16 March 2012 Mar, Dag wrote: > > If I'm not mistaken, something is missing from the 2.4 -> calligra/2.4 > > conversion in sheets/part/View.cpp:1179 > > > > Att patch fixes, but could you check it out Boudewijn, it seems you were > > the last to touch this code. > > Aw, yes, that must have been a merging error. Your patch is correct. I think the merging error was actually on my side. I committed the fix now. I probably shouldn't have tried to port just my patches from the wrong 2.4 branch to the real 2.4 branch, as that needlessly complicated things. Marijn _______________________________________________ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel