Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api

.gitignore

CMakeLists.txt

README.txt

data/.gitkeep

etc/CMakeLists.txt

etc/cmake/.gitkeep

etc/cmake/UseRobotAPI.cmake

gpl-2.0.txt

interface/CMakeLists.txt

interface/slice/.gitkeep

interface/slice/units/HapticUnit.ice

scenarios/CMakeLists.txt

scenarios/MovePlatformTest/configs/MovePlatformExample.xml

...ePlatformTest/configs/MovePlatformExampleCloseToTable.xml

...ndmarkTest/configs/MovePlatformToLandmarkExampleGraph.xml

scenarios/WeissHapticSensorsUnitTest/CMakeLists.txt

...s/WeissHapticSensorsUnitTest/config/HapticObserverApp.cfg

...eissHapticSensorsUnitTest/config/WeissHapticSensorApp.cfg

...apticSensorsUnitTest/config/WeissHapticSensorsUnitApp.cfg

scenarios/WeissHapticSensorsUnitTest/jquery.sparkline.js