Thanks, I've backported my commits with merge conflicts, and a couple more that were excluded initially.
On Mon, Jan 1, 2018 at 4:44 PM, Bastien Montagne <montagn...@wanadoo.fr> wrote: > Hi devs, > > Created the branch and backported most of listed commits, a few ones are > not applying cleanly. Please double-check updated list, would be better if > the authors could handle to conflict resolution themthelves. ;) > > http://pasteall.org/745656 > > Thanks and wish you all a happy new Year! :) > Bastien > > > > Le 27/12/2017 à 12:05, Bastien Montagne a écrit : > >> So… looks like our list of commits to backport is too long, even the ML >> server does not want to swallow it. :) >> >> Here is the list we gathered, Sergey and I: http://pasteall.org/737326 >> >> First part are commits we think should be included, please double-check >> yours though. >> >> Second part are commits we should rather not backport, though they might >> be considered. Please check them to see if you really want to include some. >> >> You may also suggest other commit of course, just keep in mind that we >> want only fixes, preferably not complex ones unless they address some >> critical issue. Enhancements or new features are only possible if they are >> really dead simple code wise. >> >> Thanks and happy Christmas, >> Bastien >> >> _______________________________________________ >> Bf-committers mailing list >> Bf-committers@blender.org >> https://lists.blender.org/mailman/listinfo/bf-committers >> > > _______________________________________________ > Bf-committers mailing list > Bf-committers@blender.org > https://lists.blender.org/mailman/listinfo/bf-committers > _______________________________________________ Bf-committers mailing list Bf-committers@blender.org https://lists.blender.org/mailman/listinfo/bf-committers