Skip to content

Conversation

@mps-ci-buildbot
Copy link
Collaborator

Merge changes from maintenance/mps20251 to master.

enikao and others added 16 commits September 17, 2025 17:58
Removing default build_languages task
Merge maintenance/mps20232 into maintenance/mps20241
…2' into merge/mps20241

# Conflicts:
#	code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
#	code/hasher/solutions/nl.f1re.mpsutil.hasher.tests/nl.f1re.mpsutil.hasher.tests.msd
#	code/hasher/solutions/nl.f1re.mpsutil.hasher/nl.f1re.mpsutil.hasher.msd
#	code/tables/languages/de.slisson.mps.tables.demolang/de.slisson.mps.tables.demolang.mpl
#	code/tables/languages/de.slisson.mps.tables/de.slisson.mps.tables.mpl
#	code/tables/languages/de.slisson.mps.tables/runtime/de.slisson.mps.tables.runtime.msd
#	code/tables/solutions/test.de.slisson.mps.tables/test.de.slisson.mps.tables.msd
…/mps20251

# Conflicts:
#	code/hasher/solutions/nl.f1re.mpsutil.hasher.tests/nl.f1re.mpsutil.hasher.tests.msd
#	code/hasher/solutions/nl.f1re.mpsutil.hasher/nl.f1re.mpsutil.hasher.msd
#	code/tables/languages/de.slisson.mps.tables.demolang/de.slisson.mps.tables.demolang.mpl
#	code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/plugin.mps
# Conflicts:
#	code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/plugin.mps
@mps-ci-buildbot mps-ci-buildbot merged commit 6fa25c1 into master Oct 15, 2025
2 checks passed
@mps-ci-buildbot mps-ci-buildbot deleted the merge/master branch October 15, 2025 08:57
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.

6 participants