]> gerrit.simantics Code Review - simantics/sysdyn.git/commit
Code Review / simantics / sysdyn.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: 945cd14) | patch
Merged Simantics trunk changes to simantics-1.8 branch: r26337:26396, r26397:26438
authorlehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Fri, 23 Nov 2012 13:46:47 +0000 (13:46 +0000)
committerlehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Fri, 23 Nov 2012 13:46:47 +0000 (13:46 +0000)
commit677f6b21a79c4eb3136161d49f1e37b8e8976efc
tree5641df2c75da7699aff1c858cefc0f8c15ad3a24tree | snapshot
parent945cd148fdb30cff6d442df8faff4acdb3851f7dcommit | diff
Merged Simantics trunk changes to simantics-1.8 branch: r26337:26396, r26397:26438

Left out Antti's migration step commit r26397.

fixes #3853

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches@26439 ac1ea38d-2e2b-0410-8846-a27921b304fc
34 files changed:
simantics-1.8/org.simantics.fmu.me.win32/libraries/FMUSimulator.dll diff | blob | history
simantics-1.8/org.simantics.fmu/FMUSolution/FMUSimulator/include/org_simantics_fmu_FMUControlJNI.h diff | blob | history
simantics-1.8/org.simantics.fmu/FMUSolution/FMUSimulator/src/fmu_control.cpp diff | blob | history
simantics-1.8/org.simantics.fmu/src/org/simantics/fmu/FMUControlJNI.java diff | blob | history
simantics-1.8/org.simantics.fmu/src/org_simantics_fmu_FMUControlJNI.h diff | blob | history
simantics-1.8/org.simantics.sysdyn.ontology/graph.tg diff | blob | history
simantics-1.8/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/adapters.xml diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/plugin.xml diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/actions/ShowInstantiatedModuleAction.java diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/actions/SysdynVariableRemover.java [new file with mode: 0644] blob
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/SimulationResult.java diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/SysdynCreationInstruction.java diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynComponentCopyAdvisor.java diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynSpecialComponentCopyAdvisor.java [new file with mode: 0644] blob
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/CloudFactory.java diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/StockFactory.java diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ValveFactory.java diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/FlowArrowLineStyle.java diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowConnectionFactory.java diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/PasteSpecialDialog.java [new file with mode: 0644] blob
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/PasteSpecialHandler.java [new file with mode: 0644] blob
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportModelHandler.java diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/menu/FontContextMenuContribution.java diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ArrayIndexesTab.java diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/arrays/AvailableEnumerations.java diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/arrays/ConflictingEnumerationLabeler.java [new file with mode: 0644] blob
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/arrays/ConflictingEnumerationNode.java [new file with mode: 0644] blob
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/arrays/UsedEnumerations.java diff | blob | history
simantics-1.8/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/validation/ValidationUtils.java diff | blob | history
simantics-1.8/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ValueIndexVariable.java diff | blob | history
simantics-1.8/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java diff | blob | history
simantics-1.8/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Stock.java diff | blob | history
Simantics System Dynamics with internal solver.