Physical units (#23)#7
Merged
AtiyahElsheikh merged 1 commit intoAtiyahElsheikh:developfrom Apr 17, 2021
Merged
Conversation
* fix merging error. partial keyword retained * reorganizing units and substances package icons into Icons directory * MSL 4.0.0 instead of 3.2.3 * Icons package extends the standard Icon package of MSL 4.0.0 * notes on the difference between Biochem.Icons and Modelica.Icons.* in the documentation * revision information * making use of Modelica.Icons.InterfacesPackage * Making use of Modelica.Icons.* when needed, however preferring Biochem Icons when available * Back to MSL 3.2.3 Usage of MSL 4.0.0 after applying the conversion script * Move annotations to the correct position in a class (#18) The Modelica grammar does not allow annotations except at the end of a class. * Convert to MSL 4.0.0 (#19) * Convert to MSL 4.0.0 * Update version number to 1.0.3 * resolve conflict due to BioChem 1.0.3 * resolve conflict due to BioChem V 1.0.3 * Let UsersGuide package be the first one * Base Icon for almost many components * Icons for physical units * removing unused older files * Backward incompatible notes added Co-authored-by: Martin Sjölund <martin@sjoelund.se>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fix merging error. partial keyword retained
reorganizing units and substances package icons into Icons directory
MSL 4.0.0 instead of 3.2.3
Icons package extends the standard Icon package of MSL 4.0.0
notes on the difference between Biochem.Icons and Modelica.Icons.* in the documentation
revision information
making use of Modelica.Icons.InterfacesPackage
Making use of Modelica.Icons.* when needed, however preferring Biochem Icons when available
Back to MSL 3.2.3
Usage of MSL 4.0.0 after applying the conversion script
The Modelica grammar does not allow annotations except at the end of a class.
Convert to MSL 4.0.0 (Convert to MSL 4.0.0 OpenModelica/BioChem#19)
Convert to MSL 4.0.0
Update version number to 1.0.3
resolve conflict due to BioChem 1.0.3
resolve conflict due to BioChem V 1.0.3
Let UsersGuide package be the first one
Base Icon for almost many components
Icons for physical units
removing unused older files
Backward incompatible notes added
Co-authored-by: Martin Sjölund martin@sjoelund.se