Merge remote branch 'origin-ipa320/master' into automerge
Merge remote branch 'origin-ipa320/master' into automerge
Merge branch 'master' of github.com:ipa-fmw/cob_manipulation
Merge branch 'indigo_dev' of https://github.com/ipa320/cob_manipulation into ipa320-indigo_dev
git push origin indigo_new_structureMerge branch 'ipa320-indigo_dev' into indigo_new_structure
missing dependency
rename controller according to new structure
Merge pull request #2 from ipa-fxm/indigo_dev

adapt namespace and add dependency
Merge branch 'indigo_dev' of github.com:ipa320/cob_manipulation into indigo_dev
updating self-collision matrix
updating controller namespaces
Merge pull request #3 from ipa-fxm/indigo_dev

update from fxm
Merge pull request #47 from ipa-fmw/indigo_new_structure

Indigo new structure