On Fri, 2009-08-07 at 10:18 -0700, Steven Dake wrote: > On Fri, 2009-08-07 at 13:24 +0200, Fabio M. Di Nitto wrote: > > On Fri, 2009-08-07 at 13:20 +0200, Fabio M. Di Nitto wrote: > > > Hi Steven, > > > > > > pretty much self explanatory. A patch for flatiron will follow shortly > > > (due to some whitespace cleanup in trunk, I haven't been able to cherry > > > pick directly). > > > > > > Fabio > > > > Patch for flatiron in attachment. Contains the 3 posted before. > > > > Will the other patches not just simply merge from trunk to flatiron? No > changes should be made to the flatiron branch except when I backport > (svn merge) patches from trunk..
This is only a convenience patch. Probably flatiron is missing a patch from trunk and I got some rejections when cherry picking my 3 patches. I believe they will apply just fine depending on what you cherry pick into flatiron. I still preferred to give you the option to test it on top of a plain flatiron tree so i made a diff. > > If your trunk patches don't merge properly I'll apply this instead.. Or I can rediff again. It's really not an issue. > but please don't apply patches to flatiron branch. No way. I know the rules, I just wanted to make your life easier and avoid merge conflicts. Fabio _______________________________________________ Openais mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/openais
