From: Jeff E. <gi...@gi...> - 2010-02-26 02:53:54
|
Merge commit 'origin/v2.4_branch' http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=11cf6cf lib/python/rs274/glcanon.py | 2 +- lib/python/rs274/interpret.py | 21 +++++++++++---- src/configure.in | 1 + src/emc/iotask/ioControl.cc | 1 + src/emc/rs274ngc/gcodemodule.cc | 10 ++++---- src/emc/rs274ngc/interp_find.cc | 2 +- src/emc/rs274ngc/rs274ngc_pre.cc | 1 + src/emc/task/emctaskmain.cc | 13 +++++++--- src/emc/usr_intf/axis/scripts/axis.py | 11 ++++++-- src/emc/usr_intf/pncconf/pncconf.py | 42 +++++++++++++++++++++++++------- src/hal/drivers/hal_parport.c | 2 +- src/hal/drivers/probe_parport.c | 22 ++++++++-------- src/hal/halmodule.cc | 4 +++ src/hal/utils/halcmd.c | 2 +- 14 files changed, 92 insertions(+), 42 deletions(-) |