This commit was applied to both 2.5 and master, was that intentional? The usual way to do things like this would be to commit the patch to the oldest applicable branch (2.5 in this case), then merge that branch into master.
Just FYI for next time ;-) On 3/16/14 16:58 , Dewey Garrett wrote: > loadtool.ngc uncondtionally apply G43 > > thanks to user pi.r for the report > > > http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=0334c74 > > --- > nc_files/ngcgui_lib/utilitysubs/loadtool.ngc | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/nc_files/ngcgui_lib/utilitysubs/loadtool.ngc > b/nc_files/ngcgui_lib/utilitysubs/loadtool.ngc > index e4dca9a..c399573 100644 > --- a/nc_files/ngcgui_lib/utilitysubs/loadtool.ngc > +++ b/nc_files/ngcgui_lib/utilitysubs/loadtool.ngc > @@ -12,8 +12,6 @@ o<l0> if [#<toolno> EQ 0] > m2 (quit) > o<l0> endif > > -o<l1> if [#5400 NE #<toolno>] > - T#<toolno> M6 G43 > -o<l1> endif > + T#<toolno> M6 G43 > > o<loadtool> endsub > > ------------------------------------------------------------------------------ > Learn Graph Databases - Download FREE O'Reilly Book > "Graph Databases" is the definitive new guide to graph databases and their > applications. Written by three acclaimed leaders in the field, > this first edition is now available. Download your free book today! > http://p.sf.net/sfu/13534_NeoTech > _____________________________________________ > Emc-commit mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/emc-commit > -- Sebastian Kuzminsky ------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
