Merge remote-tracking branch 'origin/electric_dev' into groovy_dev
Merge remote-tracking branch 'origin/groovy_dev' into groovy_dev
Merge branch 'groovy_dev' of github.com:ipa320/cob_common into groovy_dev
Merge branch 'groovy_dev' of github.com:ipa320/cob_common into groovy_dev
Merge branch 'hydro_dev' of github.com:abubeck/cob_common into hydro_dev
Merge branch 'hydro_dev' of git://github.com/ipa320/cob_common into hydro_dev
Fixed type error
merge fix
visual and collision geometry of cameras are now not colliding with head_cover anymore
optimize effort and joint limits + use visual mesh as collision for upper neck to give arem some more space
some helper makros for default inertia
Merge branch 'groovy_dev' of github.com:ipa320/cob_common into groovy_dev
modify axis on mesh model
Merge pull request #1 from ipa-nhg/groovy_dev

modify axis on mesh model
Adjust limits for tray and torso
Fixed tray powerball
Adapt tray position
Merge pull request #68 from ipa-cob3-5/groovy_dev

cob3-5 setup
Merge branch 'hydro_dev' of https://github.com/ipa-fxm/cob_common into hydro_dev
Merge pull request #8 from ipa320/groovy_dev

get ipa320 updates