[Emc-commit] master: Merge branch 'v2.5_branch'

[Chris R. <gi...@gi...>]

Merge branch 'v2.5_branch'



http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=1225d03


 docs/src/config/ini_config.txt                     |    5 ++
 docs/src/config/pncconf.txt                        |   16 +++++--
 src/emc/kinematics/tc.h                            |    5 ++
 src/emc/kinematics/tp.c                            |   17 ++++++++
 src/emc/motion/command.c                           |    2 +-
 src/emc/motion/emcmotcfg.h                         |    8 ++-
 .../usr_intf/pncconf/pncconf-help/help-mesa.txt    |   13 +++++-
 src/emc/usr_intf/pncconf/pncconf.py                |   21 +++++-----
 src/hal/drivers/mesa-hostmot2/hostmot2.c           |   43 ++++++++++++++++----
 9 files changed, 101 insertions(+), 29 deletions(-)