Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed opencv include names #90

Merged
merged 17 commits into from Jan 24, 2018
Merged

fixed opencv include names #90

merged 17 commits into from Jan 24, 2018

Conversation

ipa-rmb
Copy link
Contributor

@ipa-rmb ipa-rmb commented Jan 22, 2018

I will use squash merge from the github GUI to make it one commit. Just review, please.

@ipa-rmb
working on Softkinetic DS 325 integration
74792cd
@ipa-rmb
added a service for computing grasp points for vacuum grippers
2712cc0
@ipa-rmb
Merge branch 'indigo_dev' of github.com:ipa-rmb/cob_perception_common…
e87af56 
… into indigo_dev
@ipa-rmb
added srv to CMakeLists
1d8d983
@ipa-rmb
Merge branch 'indigo_dev' of https://github.com/ipa320/cob_perception…
e35382b 
…_common into indigo_dev
@ipa-rmb
added property to a service
0e0f20d
@ipa-rmb
Merge branch 'indigo_dev' of github.com:ipa-rmb/cob_perception_common…
1a1b24d 
… into indigo_dev
@ipa-rmb
remove grasping service
4706fee
@ipa-rmb
Merge branch 'indigo_dev' of github.com:ipa320/cob_perception_common …
58f04a0 
…into indigo_dev
@ipa-rmb
Merge branch 'indigo_dev' of https://github.com/ipa320/cob_perception…
6b0a9f4 
…_common into indigo_dev
@ipa-rmb
Merge branch 'indigo_dev' of https://github.com/ipa-rmb/cob_perceptio…
8d1d941 
…n_common into indigo_dev
@ipa-rmb
removed unnecessary cmake_modules in CMakeLists
903b9eb
@ipa-rmb
Merge branch 'indigo_dev' of https://github.com/ipa320/cob_perception…
553c242 
…_common into indigo_dev
@ipa-rmb
Merge branch 'indigo_dev' of https://github.com/ipa320/cob_perception…
ca3b917 
…_common into indigo_dev
@ipa-rmb
Merge branch 'indigo_dev' of github.com:ipa-rmb/cob_perception_common…
d0da4a4 
… into indigo_dev
@ipa-rmb
Merge branch 'indigo_dev' of https://github.com/ipa320/cob_perception…
cf7edaa 
…_common into indigo_dev
@ipa-rmb
fixed opencv include names
39739d0
fmessmer
fmessmer approved these changes Jan 22, 2018
View reviewed changes
Copy link
Member

@fmessmer fmessmer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks ok...
just provide features/fixes from a feature branch to prevent such messiy PRs

@ipa-rmb ipa-rmb merged commit 0acef9f into ipa320:indigo_dev Jan 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fmessmer fmessmer fmessmer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ipa-rmb @fmessmer