On Feb 16, 2015, at 2:54 AM, "Alan W. Irwin" <ir...@beluga.phys.uvic.ca> wrote:
> On 2015-02-15 23:04-0500 Jim Dishaw wrote: > >> I think I successfully got my master updated and rebased my branch. I have >> attached a patch that captures my work relative to the current master. I >> really hope this patch works without conflicts! > > Please use the correct term which is "patch series" or commit series > since I think there will be less mistakes and a cleaner mental model > of what is going on if the correct terminology is used. > <snip> > > It does appear like you attempted to rebase rather than starting fresh > because now your first patch has degenerated to a one-line whitespace > change which is probably not allowed by our uncrustify styler in any > case. Of course, the I have started a new topic branch and I'm folding in my changes into that branch. I will get a new patch series out as soon as I can. Sorry for the confusion. ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
