saicanon: report M6x related canon calls
gmoccapy_1_1_1 - macro handling bug

ver. 1.1.1
- small bug in macro button handling, if a macro was not found, gmoccapy
  raised an exception, because wrong variable name.
Merge branch 'master' of ssh://norbert@git.linuxcnc.org/git/linuxcnc.git
new pyvcp_widgets

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


Signed-off-by: Michael Haberler <git@mah.priv.at>
Merge branch '2.6'
Merge branch '2.6'
Merge branch '2.6'
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'
Merge remote-tracking branch 'origin/2.6'
bump version number of master to 2.7.0-pre0
gmoccapy_1_1_3 - solved G92 as system bug

ver. 1.1.3
- it was possible to push btn_set_selected on offset page
  to set a coordinate system with G92 selected, or being
  in edit offset mode, this is now avoided.
Merge remote-tracking branch 'origin/2.6'
gmoccapy_1_1_4 - show screen 2 button only sensitive if file exist
               - gcode.lang is back

ver. 1.1.4
- added again the gcode.lang file, it got lost, after changing gmoccapy to be
  stand alone
- the show screen2 button is now only sensitive if a file gmoccapy2.glade does
  exist in the config dir.
Merge branch '2.6'
Merge branch 'master' of ssh://norbert@git.linuxcnc.org/git/linuxcnc.git
Merge branch '2.6' of ssh://norbert@git.linuxcnc.org/git/linuxcnc.git
Merge branch '2.6'

Conflicts:
	VERSION
Merge branch '2.6' of ssh://norbert@git.linuxcnc.org/git/linuxcnc.git into 2.6
gladevcp - iconview.py - bug filling store if filename has several dots

files containing two dots in there name was not shown in iconview.
i.e. Pocket 2.5 step(1).ngc has not been shown, now only the most right
dot is used to get the file extension

corrected that