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

Fixing typos and unwanted changes in several packages #2525

Merged
merged 5 commits into from
May 16, 2018

Conversation

GallLeo
Copy link
Contributor

@GallLeo GallLeo commented May 4, 2018

This pull request fixes typos in various sub-libraries and one bug in the annotation of Modelica.Thermal.HeatTransfer.Fahrenheit.PrescribedTemperature.

This has been done semi-automatic. I tried hard to not introduce unwanted changes. Please review changes.

@GallLeo GallLeo requested a review from christiankral May 4, 2018 11:46
@GallLeo GallLeo added this to the MSL3.2.3 milestone May 4, 2018
@@ -2495,7 +2495,7 @@ i.e., it defines a fixed temperature as a boundary condition.
Text(
extent={{-150,150},{150,110}},
textString="%name",
lineCdefaultComponentName="temperatureSource",olor={0,0,255}),
Copy link
Member

@beutlich beutlich May 4, 2018

Choose a reason for hiding this comment

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

Nice one.

beutlich added a commit to GallLeo/ModelicaStandardLibrary that referenced this pull request May 4, 2018
@beutlich
Copy link
Member

@christiankral It would be more fortunate if you first check the open pull requests (like this one) and afterwards rearrange the models (like done in fa63e56) to avoid merge conflicts. Anyway, I rebased the 5 commits on fa63e56 and resolved the merge conflict.

@christiankral
Copy link
Contributor

@beutlich Sorry for messing up some pull request. If will check those first in the future, before making changes.

@beutlich beutlich merged commit 43cde26 into modelica:master May 16, 2018
@beutlich beutlich self-assigned this May 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants