merged

data/RobotAPI/VariantInfo-RobotAPI.xml

scenarios/tests/WeissHapticSensorsUnitTest/CMakeLists.txt

...ts/WeissHapticSensorsUnitTest/config/ConditionHandler.cfg

.../tests/WeissHapticSensorsUnitTest/config/RobotControl.cfg

...ests/WeissHapticSensorsUnitTest/config/SystemObserver.cfg

.../WeissHapticSensorsUnitTest/config/WeissHapticUnitApp.cfg

...nitTest/config/XMLRemoteStateOfferer.WeissHapticGroup.cfg

scenarios/tests/WeissHapticSensorsUnitTest/startGui.sh

scenarios/tests/WeissHapticSensorsUnitTest/tactile.html

source/RobotAPI/applications/CMakeLists.txt

source/RobotAPI/applications/HapticObserver/CMakeLists.txt

source/RobotAPI/applications/WeissHapticUnit/CMakeLists.txt

...obotAPI/applications/WeissHapticUnit/WeissHapticUnitApp.h

source/RobotAPI/applications/WeissHapticUnit/main.cpp

source/RobotAPI/components/CMakeLists.txt

source/RobotAPI/components/units/HapticObserver.cpp

source/RobotAPI/components/units/HapticObserver.h

source/RobotAPI/components/units/TCPControlUnit.cpp

...RobotAPI/gui_plugins/HandUnitPlugin/HandUnitGuiPlugin.cpp

...e/RobotAPI/gui_plugins/HandUnitPlugin/HandUnitGuiPlugin.h