Add some missing M-codes to the "G-code quick-reference" html docs.
Merge branch '2.6' of ssh://git.linuxcnc.org/git/linuxcnc into 2.6
French doc: cleaning typo

Signed-off-by: Francis Tisserant <tissf@free.fr>
hm2: add support for muxed encoder version 4

Signed-off-by: Michael Geszkiewicz <micges@wp.pl>
hm2: muxed encoder: add support for FilterRate and Muxed Skew register.

FilterRate: sets the sampling rate for all quadrature counters input filters.
MuxedSkew: Version 4 and greater muxed encoders have 4 bit muxed data deskew register
This delays the sampling time of muxed encoder data by 0 to 15 ClockLow
periods to accomodate long cables and isolation delays and allow higher
multiplex rates.

Signed-off-by: Michael Geszkiewicz <micges@wp.pl>
hm2: add support for 5i24 board

Signed-off-by: Michael Geszkiewicz <micges@wp.pl>
new pyvcp_widgets

this fixes http://sourceforge.net/p/emc/bugs/364/

Signed-off-by: Michael Haberler <git@mah.priv.at>
Add a pin width limit to the Hostmot2 Stepgen

The recent addition of support for table mode to the Hostmot2 stepgen had an unfortunate
and unintended consequence. Some of the existing bitfiles did have wide stepgens included
but this was masked by the driver. Users that have configured these stepgen pins as GPIO
are likely to find that important parts of their machines no longer work.
This patch adds an extra parameter to the hm2 modparams so that system builders
have to actively choose to use the wide stepgens.

Signed-off-by: andy pugh <andy@bodgesoc.org>
Merge remote-tracking branch 'origin/v2.5_branch' into 2.6

Conflicts:
	lib/python/pyvcp_widgets.py
French doc: cleaning and add M19

Signed-off-by: Francis Tisserant <tissf@free.fr>
French doc: cleaning, add M70...M73, fix brocken links

Signed-off-by: Francis Tisserant <tissf@free.fr>
deb: change package maintainer to Seb
deb: add support for building on Ubuntu Trusty Tahr 14.04
Component: fix incorrect calculation of velocity tolerance percent
the velocity tolerance would end up being much too small as you increased
the value.

Signed-off-by: John Thornton <jthornton@gnipsel.com>
Merge remote-tracking branch 'origin/v2.5_branch' into 2.6
docs: update Italian gettext translation

Thanks to Ernesto Lo Valvo for contributing this translation update.
gmoccapy_1_1_2 - scaling bug for jog wheel pin solved

ver. 1.1.2
- after changing units according to G20 / G21 the scales to be
  applied to the jog wheel pin (jog_vel and max_vel has not been
  changed, resulting in very large jumps after changing from
  metric to imperial, i.e. one count should move the slider 100
  increments in metric, but did that amount also in imperial,
  insteadt only advancing 4 steps.
- all sliders and vel infos are now changing according to G20/G21
  beeing active.
- There is still work to do on the offsetpage widget,
  IMHO it is buggy
gmoccapy_1_1_2 - scaling bug for jog wheel pin solved

ver. 1.1.2
- after changing units according to G20 / G21 the scales to be
  applied to the jog wheel pin (jog_vel and max_vel has not been
  changed, resulting in very large jumps after changing from
  metric to imperial, i.e. one count should move the slider 100
  increments in metric, but did that amount also in imperial,
  insteadt only advancing 4 steps.
- all sliders and vel infos are now changing according to G20/G21
  beeing active.
- There is still work to do on the offsetpage widget,
  IMHO it is buggy
Merge branch '2.6'