Merge remote-tracking branch 'origin/2.7'
Conflicts: docs/man/man1/halstreamer.1 lib/python/gladevcp/combi_dro.py src/emc/motion/command.c src/emc/task/emccanon.cc src/emc/usr_intf/emcrsh.cc src/emc/usr_intf/gmoccapy/getiniinfo.py src/hal/components/biquad.comp src/hal/components/orient.comp src/hal/components/streamer.c
Loading
Please register or sign in to comment