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

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

Merge branch 'v2.4_branch'



http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=68221b5


 docs/README                         |    5 +-
 docs/src/config/lathe_config.lyx    |   13 +--
 docs/src/config/stepconf.lyx        |    8 ++-
 docs/src/config/stepper.lyx         |   27 +++---
 docs/src/hal/basic_hal.lyx          |   22 +++---
 docs/src/hal/halshow.lyx            |  149 +++++++++++++++--------------------
 docs/src/lathe/lathe-user.lyx       |   82 ++++++++++----------
 src/emc/rs274ngc/tool_parse.cc      |    3 +-
 src/emc/usr_intf/pncconf/pncconf.py |   28 +++---
 9 files changed, 158 insertions(+), 179 deletions(-)