Skip to content

Conversation

@mps-ci-buildbot
Copy link
Contributor

Merge changes from maintenance/MPS-2023.2 to maintenance/MPS-2024.1.

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

mpsqa.arch: add support for adding additional information to component definitions and module components
Alexander Pann added 3 commits March 11, 2025 09:53
…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
@alexanderpann alexanderpann disabled auto-merge March 11, 2025 10:15
@alexanderpann alexanderpann merged commit 02e7afc into maintenance/MPS-2024.1 Mar 11, 2025
1 check failed
@alexanderpann alexanderpann deleted the merge/MPS-2024.1 branch March 11, 2025 10:15
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.

3 participants