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

Rename freqHz to f in Sources and Blocks #3046

Merged
merged 5 commits into from
Jul 16, 2019

Conversation

christiankral
Copy link
Contributor

Refs #3035

@christiankral christiankral added L: Blocks Issue addresses Modelica.Blocks L: Electrical.Analog Issue addresses Modelica.Electrical.Analog L: Electrical.MultiPhase Issue addresses Modelica.Electrical.MultiPhase labels Jul 15, 2019
@christiankral christiankral added this to the MSL4.0.0 milestone Jul 15, 2019
@beutlich
Copy link
Member

@christiankral Caution, I rebased your branch to resolve the conflict.

Copy link
Member

@beutlich beutlich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update ModelicaTest, too!

@beutlich beutlich requested a review from AHaumer July 15, 2019 17:24
@beutlich beutlich merged commit 0a2e0aa into modelica:master Jul 16, 2019
@christiankral christiankral deleted the freqHz-f branch July 16, 2019 15:20
@beutlich beutlich added L: Electrical.Polyphase Issue addresses Modelica.Electrical.Polyhase and removed L: Electrical.MultiPhase Issue addresses Modelica.Electrical.MultiPhase labels Jul 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
L: Blocks Issue addresses Modelica.Blocks L: Electrical.Analog Issue addresses Modelica.Electrical.Analog L: Electrical.Polyphase Issue addresses Modelica.Electrical.Polyhase
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants