From: Jeff E. <gi...@gi...> - 2010-06-27 01:01:43
|
Merge remote branch 'origin/v2.4_branch' http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=1fd5c42 configs/smithy/1240.hal | 6 +++--- configs/smithy/6130.hal | 9 ++++++--- configs/smithy/622leadshine.hal | 1 - scripts/emcmkdesktop.in | 2 +- src/hal/drivers/mesa-hostmot2/hm2_7i43.c | 2 ++ src/hal/drivers/mesa-hostmot2/hm2_pci.c | 2 +- src/hal/drivers/mesa-hostmot2/hostmot2.c | 2 +- src/rtapi/rtapi_math.h | 2 ++ src/rtapi/rtapi_math_i386.h | 12 +++++++++++- tcl/bin/pickconfig.tcl | 6 +++--- 10 files changed, 30 insertions(+), 14 deletions(-) |