[Soc-2010-dev] merge plans

[Leif Andersen]

Nope, haven't unsubscribed.  I will spend some time over the next few weeks
to prepare for merging.  I would expect though that the API that I was
testing against has changed quite a bit (in syntax anyway), since the last
time I've worked on it.

~Leif Andersen

----------
Searching a DAG: http://xkcd.com/761/


On Tue, Feb 8, 2011 at 19:35, Nicholas Bishop <nicholasbishop at gmail.com>wrote:

> I've been working on separating out the ptex code from my branch into
> a new patch against trunk. (I think the ptex work is the most
> merge-ready part of the code I wrote last summer.)
>
> It's taking a while to get this done though, not nearly enough time in
> the day :)
>
> -Nicholas
>
> On Tue, Feb 8, 2011 at 9:31 PM, Tom M <letterrip at gmail.com> wrote:
> > Nick,
> >
> > excellent to hear.  Anyone else have plans yet or did you all
> > unsubscribe at the end of GSoC :)
> >
> > LetterRip
> >
> > On Sun, Feb 6, 2011 at 11:10 PM, Nick Samarin <nicks1987 at bigmir.net>
> wrote:
> >> Hi
> >>
> >> I plan to prepare my branch (nicks, Recast&Detour integration) for merge
> in
> >> a few weeks. I think there is a some work to do because the last update
> was
> >> in October.
> >> Best regards,
> >> Nick Samarin
> >> 2011/2/6 Tom M <letterrip at gmail.com>
> >>>
> >>> Hi all,
> >>>
> >>> we are inching closer and closer to Blender 2.6 being 'Done'.  Which
> >>> means that the hard work that you guys have done, as well as other
> >>> major branches, will be able to be merged into the main tree if they
> >>> are ready.
> >>>
> >>> I know that some of your projects were pretty much ready to merge at
> >>> the end of GSoC, other projects had parts of their project ready to
> >>> merge, while yet others had a bit more work they wanted to finish up.
> >>>
> >>> If you have a bit of free time, would be interested in hearing what
> >>> you feel the status of your project is, and also whether you think you
> >>> can find some time to get it merge ready etc.
> >>>
> >>> By end of May we think 2.6 final could occur, after which point an
> >>> orderly merging of branches can occur.  We are essentially in bug
> >>> fix/todo list only mode, so the changes to head are quite trivial and
> >>> should make life easier for getting ready to merge.
> >>>
> >>> Tom M.
> >>> LetterRip
> >>> _______________________________________________
> >>> Soc-2010-dev mailing list
> >>> Soc-2010-dev at blender.org
> >>> http://lists.blender.org/mailman/listinfo/soc-2010-dev
> >>
> >>
> >> _______________________________________________
> >> Soc-2010-dev mailing list
> >> Soc-2010-dev at blender.org
> >> http://lists.blender.org/mailman/listinfo/soc-2010-dev
> >>
> >>
> > _______________________________________________
> > Soc-2010-dev mailing list
> > Soc-2010-dev at blender.org
> > http://lists.blender.org/mailman/listinfo/soc-2010-dev
> >
> _______________________________________________
> Soc-2010-dev mailing list
> Soc-2010-dev at blender.org
> http://lists.blender.org/mailman/listinfo/soc-2010-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.blender.org/pipermail/soc-2010-dev/attachments/20110208/1da46e52/attachment.htm