[Libreoffice] ooo/OOO330_m14 merged into libreoffice-3-3

[Miklos Vajna]

On Thu, Nov 11, 2010 at 08:04:38PM +0100, Rene Engelhard <rene at debian.org> wrote:
> On Thu, Nov 11, 2010 at 07:51:55PM +0100, Jan Holesovsky wrote:
> > Either we can merge the entire libreoffice-3-3 there, or we can merge
> > just ooo/OOO330_m14, and continue cherry picking between master and
> > libreoffice-3-3.
> 
> +1 for merging libreoffice-3-3

Sure, other projects are doing it like this already, i.e git.git has the
same policy (features go to master, fixes to maint, then maint is merged
to master regularly).
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20101112/6f6e8260/attachment.pgp>