]> gerrit.simantics Code Review - simantics/sysdyn.git/commit
Merge until trunk@25092 to branches/simantics-1.6 on 2012-06-01. refs #3455
authorlehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Fri, 1 Jun 2012 12:22:30 +0000 (12:22 +0000)
committerlehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Fri, 1 Jun 2012 12:22:30 +0000 (12:22 +0000)
commit780d384addb95ecb89e56d4f22ba49431cfd051c
treead5d5caf489ee46f7c796297c3b036f8a965eea1
parent1738b8ca2ee25235aa70f25de663ba213c6b88fa
Merge until trunk@25092 to branches/simantics-1.6 on 2012-06-01. refs #3455

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches@25093 ac1ea38d-2e2b-0410-8846-a27921b304fc
37 files changed:
simantics-1.6/org.simantics.modelica/FMUSolution/FMUSolution.opensdf [deleted file]
simantics-1.6/org.simantics.modelica/src/org/simantics/modelica/data/CSVSimulationResult.java
simantics-1.6/org.simantics.modelica/src/org/simantics/modelica/data/Mat4Reader.java
simantics-1.6/org.simantics.modelica/src/org/simantics/modelica/data/MatSimulationResult.java
simantics-1.6/org.simantics.modelica/src/org/simantics/modelica/data/SimulationResult.java
simantics-1.6/org.simantics.sysdyn.ontology/graph.tg
simantics-1.6/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
simantics-1.6/org.simantics.sysdyn.ontology/graph/SysdynFunctions.pgraph
simantics-1.6/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
simantics-1.6/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/Configuration.java
simantics-1.6/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/FunctionLibraries.java
simantics-1.6/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/LibraryFunctions.java
simantics-1.6/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/ModuleType.java
simantics-1.6/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynComponentCopyAdvisor.java
simantics-1.6/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/menu/PlaybackSliderContribution.java
simantics-1.6/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ConfigurationTab.java
simantics-1.6/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EquationTab.java
simantics-1.6/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ArrayExpressionCombo.java
simantics-1.6/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/arrays/NameAndArrayRangeModifyListener.java [new file with mode: 0644]
simantics-1.6/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/structure/ModuleStructureGraphRequest.java
simantics-1.6/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ExpressionUtils.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/VariableRVIUtils.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/HistoryDatasetResult.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiment.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynInitKeys.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynModel.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynPlaybackExperiment.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/modelica/ModelicaWriter.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Book.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Configuration.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Model.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Sheet.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Variability.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/WithLookupExpression.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/utils/SheetFormatUtils.java
simantics-1.6/org.simantics.sysdyn/src/org/simantics/sysdyn/simulation/SimulationJob.java