Skip to content

Merge maintenance/MPS-2024.3 into master#306

Merged
mps-ci-buildbot merged 8 commits intomasterfrom
merge/master
Mar 11, 2025
Merged

Merge maintenance/MPS-2024.3 into master#306
mps-ci-buildbot merged 8 commits intomasterfrom
merge/master

Conversation

@mps-ci-buildbot
Copy link
Copy Markdown
Contributor

Merge changes from maintenance/MPS-2024.3 to master.

Alexander Pann added 8 commits March 3, 2025 14:41
…odule_information

mpsqa.arch: add support for adding additional information to component definitions and module components
…4.1' into merge/MPS-2024.1

# Conflicts:
#	code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/org.mpsqa.arch.mpl
#	code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd
#	code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps
Merge maintenance/MPS-2023.2 into maintenance/MPS-2024.1
Merge maintenance/MPS-2024.1 into maintenance/MPS-2024.3
@mps-ci-buildbot mps-ci-buildbot merged commit 5fc5ac3 into master Mar 11, 2025
3 checks passed
@mps-ci-buildbot mps-ci-buildbot deleted the merge/master branch March 11, 2025 10:53
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