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

Merge maintenance/mps20232 into master #1231

Merged
merged 16 commits into from
Mar 20, 2025
Merged

Merge maintenance/mps20232 into master #1231

merged 16 commits into from
Mar 20, 2025

Conversation

github-actions[bot]
Copy link
Contributor

Merge changes from maintenance/mps20232 to master.

mfsoliveira and others added 14 commits February 14, 2025 14:48
…ore to iets3.os.

Affected languages:
   org.iets3.components.hardware - components languages were added to iets3.comp.os plugin
   org.iets3.components.functional
   org.iets3.components.toplevel.adapter
   org.iets3.core.mapping - added to org.iets3.core.mapping pluging
   org.iets3.protocol.transport - added to new plugin org.iets3.protocol
   org.iets3.safety.attributes - added to new plugin org.iets3.safety
Affected devkits:
   org.iets3.hardwarecomponents
   org.iets3.functionalcomponenets
   org.iets3.components
…mps20232

# Conflicts:
#	code/languages/org.iets3.opensource/languages/test.org.iets3.core.trace/test.org.iets3.core.trace.mpl
#	code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
alexanderpann
alexanderpann previously approved these changes Mar 20, 2025
@alexanderpann alexanderpann merged commit e8ddbcf into master Mar 20, 2025
2 checks passed
@alexanderpann alexanderpann deleted the merge/mps20232 branch March 20, 2025 12:27
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