[Soc-2010-dev] merge plans
nicks1987 at bigmir.net
Mon Feb 7 09:10:05 CET 2011
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
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.
> Soc-2010-dev mailing list
> Soc-2010-dev at blender.org
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Soc-2010-dev