Skip to content

Commit 0cbde80

Browse files
authored
Merge branch 'master' into ST6RI-64
2 parents 522040e + e516f43 commit 0cbde80

15 files changed

Lines changed: 258 additions & 32 deletions

File tree

489 KB
Binary file not shown.

org.omg.sysml.interactive/src/org/omg/sysml/interactive/SysMLInteractive.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change

org.omg.sysml.jupyter/src/main/resources/kernel/kernel.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change

sysml.library/Kernel Library/ComplexFunctions.kerml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change

sysml.library/Kernel Library/IntegerFunctions.kerml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change

sysml.library/Kernel Library/RealFunctions.kerml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change

sysml.library/Kernel Library/ScalarFunctions.kerml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change

sysml/src/examples/Mass Roll-up Example/Vehicles.sysml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change

sysml/src/training/22. Expressions/MassRollup.sysml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change

sysml/src/training/22. Expressions/VehicleMasses.sysml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change

0 commit comments

Comments
 (0)