Skip to content
Snippets Groups Projects
  • Giammarco, Kristin M's avatar
    aa7cd8aa
    Merge branch 'master' into 'Keane_Branch' · aa7cd8aa
    Giammarco, Kristin M authored
    # Conflicts:
    #   Example01_SimpleMessageFlow_EventCoordination.mp
    #   Example01a_UnreliableMessageFlow_VirtualEvents.mp
    #   Example02_DataFlow_EventSharing.mp
    #   Example03_ATMWithdrawal_BehaviorOfEnvironment.mp
    #   Example06_UnreliableChannel_AssertionChecking.mp
    #   Example09_PipeFilter_TraceAnnotationQueries.mp
    #   Example12_CardiacArrestWorkflow_VirtualEvents.mp
    #   Example15_BackpackWeight_IntervalAttributes.mp
    #   Example18_RedGreen_BayesianProbabilityCalculationsType2.mp
    #   Example21_DataFlow_LocalReport.mp
    #   Example22_SimpleMessageFlow_GlobalReport.mp
    #   Example24_Compiler_ComponentDiagram.mp
    #   Example25_Graph_as_Data_Structure.mp
    #   Example26_UnreliableMessageFlow_GlobalQuery.mp
    #   Example28_AssemblingStatistics_Histogram.mp
    #   Example29_AssemblingStatistics_Gantt_Chart.mp
    #   Example30_MicrowaveOven_ModelingModelChecking.mp
    #   Example33_ATMWithdrawal_StatechartView.mp
    #   Example35_FiniteStateDiagram_PathDiagram.mp
    #   Example36_Authentication_SystemReuse.mp
    aa7cd8aa
    History
    Merge branch 'master' into 'Keane_Branch'
    Giammarco, Kristin M authored
    # Conflicts:
    #   Example01_SimpleMessageFlow_EventCoordination.mp
    #   Example01a_UnreliableMessageFlow_VirtualEvents.mp
    #   Example02_DataFlow_EventSharing.mp
    #   Example03_ATMWithdrawal_BehaviorOfEnvironment.mp
    #   Example06_UnreliableChannel_AssertionChecking.mp
    #   Example09_PipeFilter_TraceAnnotationQueries.mp
    #   Example12_CardiacArrestWorkflow_VirtualEvents.mp
    #   Example15_BackpackWeight_IntervalAttributes.mp
    #   Example18_RedGreen_BayesianProbabilityCalculationsType2.mp
    #   Example21_DataFlow_LocalReport.mp
    #   Example22_SimpleMessageFlow_GlobalReport.mp
    #   Example24_Compiler_ComponentDiagram.mp
    #   Example25_Graph_as_Data_Structure.mp
    #   Example26_UnreliableMessageFlow_GlobalQuery.mp
    #   Example28_AssemblingStatistics_Histogram.mp
    #   Example29_AssemblingStatistics_Gantt_Chart.mp
    #   Example30_MicrowaveOven_ModelingModelChecking.mp
    #   Example33_ATMWithdrawal_StatechartView.mp
    #   Example35_FiniteStateDiagram_PathDiagram.mp
    #   Example36_Authentication_SystemReuse.mp