[Libreoffice] Weekly merge of libreoffice-3-4 -> master
kyoshida at novell.com
Mon Jun 6 11:00:18 PDT 2011
On Mon, 2011-06-06 at 12:07 -0400, Kohei Yoshida wrote:
> On Mon, 2011-06-06 at 14:55 +0200, Jan Holesovsky wrote:
> > - calc: Kohei, can you please do it? There were 3 conflicts or so.
> I'll work on it once my clean build of master finishes.
Done. Though I'm not sure if I did it right with the changes in
ScDBData, since both branches made heavy and different changes to the
implementation of this class...
Kohei Yoshida, LibreOffice hacker, Calc
<kyoshida at novell.com>
More information about the LibreOffice