From: Jeff E. <gi...@gi...> - 2010-03-23 21:09:49
|
Merge remote branch 'origin/v2.4_branch' Conflicts: src/emc/rs274ngc/gcodemodule.cc src/emc/usr_intf/axis/scripts/axis.py http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=d990f86 .gitignore | 1 + nc_files/polar.ngc | 28 ++++++++-------------------- src/Makefile | 2 +- src/emc/rs274ngc/interp_cycles.cc | 12 ++++++------ src/emc/rs274ngc/interp_find.cc | 8 ++++++-- 5 files changed, 22 insertions(+), 29 deletions(-) |