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

Set ESP flag and change rtps branch #99

Merged
merged 2 commits into from
Oct 18, 2021
Merged

Conversation

Acuadros95
Copy link
Contributor

Merge ESP and cubeIDE branchs of embeddedRTPS

libmicroros.mk Outdated Show resolved Hide resolved
@pablogs9 pablogs9 merged commit b705d70 into galactic Oct 18, 2021
@pablogs9 pablogs9 deleted the feature/rtps_branch branch October 18, 2021 13:09
@Acuadros95
Copy link
Contributor Author

@mergify backport main

mergify bot pushed a commit that referenced this pull request Oct 18, 2021
* Set ESP flag and change rtps branch

* Update libmicroros.mk

(cherry picked from commit b705d70)

# Conflicts:
#	libmicroros.mk
@mergify
Copy link
Contributor

mergify bot commented Oct 18, 2021

backport main

✅ Backports have been created

Hey, I reacted but my real name is @Mergifyio

Acuadros95 added a commit that referenced this pull request Oct 18, 2021
* Set ESP flag and change rtps branch (#99)

* Set ESP flag and change rtps branch

* Update libmicroros.mk

(cherry picked from commit b705d70)

# Conflicts:
#	libmicroros.mk

* Fix branch

Co-authored-by: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com>
Co-authored-by: Antonio Cuadros <acuadros1995@gmail.com>
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.

2 participants