Skip to content
  • Markus Mirz's avatar
    Merge branch 'development' into 'shared-factory' · df8fed89
    Markus Mirz authored
    # Conflicts:
    #   Examples/Cxx/Circuits/DP_IdealVS_PILine1.cpp
    #   Examples/Cxx/Circuits/DP_IdealVS_R1.cpp
    #   Examples/Cxx/Circuits/DP_IdealVS_R2.cpp
    #   Examples/Cxx/Circuits/DP_IdealVS_RLC1.cpp
    #   Examples/Cxx/Circuits/DP_IdealVS_RXLine1.cpp
    #   Examples/Cxx/Circuits/DP_IdealVS_RXLine2.cpp
    #   Examples/Cxx/Circuits/DP_IdealVS_Trafo.cpp
    #   Examples/Cxx/Circuits/DP_IdealVS_TrafoIdeal.cpp
    #   Examples/Cxx/Circuits/DP_ResVS_PILine1.cpp
    #   Examples/Cxx/Circuits/DP_ResVS_RL1.cpp
    #   Examples/Cxx/Circuits/DP_ResVS_RL2.cpp
    #   Examples/Cxx/Circuits/DP_ResVS_RLC1.cpp
    #   Examples/Cxx/Circuits/DP_ResVS_RXLine1.cpp
    #   Examples/Cxx/Circuits/EMT_IdealVS_R1.cpp
    #   Examples/Cxx/Circuits/EMT_ResVS_RXLine_Switch1.cpp
    #   Examples/Cxx/VariableTimeStep/RXLine_LoadStep_FreqStep_1.cpp
    #   Examples/Cxx/VariableTimeStep/RXLine_LoadStep_FreqStep_2.cpp
    df8fed89