[Libreoffice] Merging the 3.4 branch to master (calc only)
kyoshida at novell.com
Mon May 9 21:48:51 PDT 2011
Just FYI, I just merged the libreoffice-3-4 branch onto master and
pushed it, but did so only with the calc repository.
There were several files in conflicts during the merge. Most of them
were pretty simple, but I wasn't sure if I merged
CppunitTest_sc_ucalc.mk correctly. So if someone (either Bjoern or
David) can give it a quick check I'd appreciate it.
Kohei Yoshida, LibreOffice hacker, Calc
<kyoshida at novell.com>
More information about the LibreOffice