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.

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

cob_supported_robots: 0.6.7-0 in 'kinetic/distribution.yaml' [bloom] #15536

Merged
merged 1 commit into from
Jul 17, 2017

Conversation

ipa-rmb
Copy link
Contributor

@ipa-rmb ipa-rmb commented Jul 17, 2017

Increasing version of package(s) in repository cob_supported_robots to 0.6.7-0:

cob_supported_robots

* Merge pull request #5 <https://github.com/ipa320/cob_supported_robots/issues/5> from ipa-nhg/cob4-8
  setup cob4-8
* setup cob4-8
* Merge pull request #4 <https://github.com/ipa320/cob_supported_robots/issues/4> from ipa-nhg/cob4-9
  Setup cob4-9
* Setup cob4-9
* Merge pull request #3 <https://github.com/ipa320/cob_supported_robots/issues/3> from ipa-nhg/cob4-paul-stuttgart
  Remove cob4-10 config
* remove cob4-10 config
* Merge pull request #2 <https://github.com/ipa320/cob_supported_robots/issues/2> from ipa-fxm/multi_distro_travis
  Multi distro travis
* fix allow_failures
* document distro support in README
* update .rosinstall files
* setup travis matrix for multiple distros
* Update README.md
* Merge pull request #1 <https://github.com/ipa320/cob_supported_robots/issues/1> from ipa-fxm/indigo_dev
  moved cob_supported_robots to separate repo
* remove cob4-1
* update robotlist
* added cob_supported_robots package
* Initial commit
* Contributors: Felix Messmer, Florian Weisshardt, Mathias Lüdtke, Nadia Hammoudeh García, ipa-cob4-8, ipa-fxm, ipa-nhg

@dirk-thomas
Copy link
Member

This branch has conflicts that must be resolved.

@ipa-rmb ipa-rmb force-pushed the bloom-cob_supported_robots-1 branch from 86944b5 to 83022b1 Compare July 17, 2017 17:15
@floweisshardt
Copy link
Contributor

@dirk-thomas we've updated the PR

@dirk-thomas
Copy link
Member

Thanks!

@dirk-thomas dirk-thomas merged commit dfe93ee into ros:master Jul 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants