On 26/09/2014 01:57, Joe Taylor wrote: > Hi Bill, Hi Joe, > >> Greg (KI7MT) has checked out the WSJT-X v1.4 branch branches/wsjtx-1.4 >> and made a change that needs to go into the next release candidate >> wsjtx-1.4.0-rc2. At the time of writing he has committed the change to >> the branch but not yet merged it into the main line (branches/wsjtx). > Actually that was me, not Greg. And I thought I had done the desired > merge -- but I recognized, after the fact, that I had not done it > correctly. :-( Oops, sorry for the incorrect attribution, I blame the hour over here. Either way it seemed a good example to introduce the concept and execution to those who may be less familiar with svn. > > I decided to put a corrected merge off until tomorrow... (am not on the > same computer, now). > > -- Joe 73 Bill G4WJS.
------------------------------------------------------------------------------ Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk _______________________________________________ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
