oops
Merge pull request #125 from robotics-in-concert/typo

oops
Merge pull request #126 from robotics-in-concert/indigo

[remocon] remappings for global executables
Merge branch 'hydro-devel' of https://github.com/robotics-in-concert/rocon_qt_gui into hydro-devel