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/MPS-2022.2 into maintenance/MPS-2022.3 #89

Merged
merged 12 commits into from
Jul 4, 2024

Commits on Jun 10, 2024

  1. Configuration menu
    Copy the full SHA
    a8bd6f8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4884400 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    083fe14 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2c38460 View commit details
    Browse the repository at this point in the history
  5. overall: migrations

    danielratiu committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    c02c03d View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Configuration menu
    Copy the full SHA
    6500dd9 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Configuration menu
    Copy the full SHA
    69fd683 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #88 from mbeddr/feature/migrate_to_enhanced_diagra…

    …mming_framework
    
    feature/migrate to enhanced diagramming framework
    danielratiu committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    0f9a354 View commit details
    Browse the repository at this point in the history
  3. ft: fixed layout

    danielratiu committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    7b9c22f View commit details
    Browse the repository at this point in the history
  4. ft: fixed layout

    danielratiu committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    08422e7 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #90 from mbeddr/feature/migrate_to_enhanced_diagra…

    …mming_framework
    
    feature/fixed the migration to enhanced diagramming framework for fault trees
    danielratiu committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    438cd3f View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Merge remote-tracking branch 'origin/maintenance/MPS-2022.3' into mer…

    …ge/MPS-2022.3
    
    # Conflicts:
    #	build.gradle.kts
    #	code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
    #	gradle.lockfile
    danielratiu committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    0fcd0ad View commit details
    Browse the repository at this point in the history