From: jsimomaa Date: Fri, 18 Jul 2014 07:03:13 +0000 (+0000) Subject: Merged trunk @29734, 29707 X-Git-Tag: 1.8.1~2 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=8facd94a8ed0f566474a2543cd109eba6c731f85;p=simantics%2Fsysdyn.git Merged trunk @29734, 29707 refs #4950 refs #4987 git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/1.8@29934 ac1ea38d-2e2b-0410-8846-a27921b304fc --- diff --git a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Discovery And Exploitation Of Resources.sysdyn b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Discovery And Exploitation Of Resources.sysdyn index e90a36a4..48ef53e1 100644 Binary files a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Discovery And Exploitation Of Resources.sysdyn and b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Discovery And Exploitation Of Resources.sysdyn differ diff --git a/org.simantics.sysdyn.feature/rootfiles/sampleModels/LogisticFunc.sysdyn b/org.simantics.sysdyn.feature/rootfiles/sampleModels/LogisticFunc.sysdyn new file mode 100644 index 00000000..683e59d0 Binary files /dev/null and b/org.simantics.sysdyn.feature/rootfiles/sampleModels/LogisticFunc.sysdyn differ diff --git a/org.simantics.sysdyn.feature/rootfiles/sampleModels/LogisticFunctions.sysdynFunctions b/org.simantics.sysdyn.feature/rootfiles/sampleModels/LogisticFunctions.sysdynFunctions new file mode 100644 index 00000000..8475b3f7 Binary files /dev/null and b/org.simantics.sysdyn.feature/rootfiles/sampleModels/LogisticFunctions.sysdynFunctions differ diff --git a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Resource Exploitation Use Recycling.sysdyn b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Resource Exploitation Use Recycling.sysdyn index 33a8815c..312de4f4 100644 Binary files a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Resource Exploitation Use Recycling.sysdyn and b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Resource Exploitation Use Recycling.sysdyn differ diff --git a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Tourists Environments And Hotel Facilities.sysdyn b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Tourists Environments And Hotel Facilities.sysdyn index def1fc4c..11461e20 100644 Binary files a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Tourists Environments And Hotel Facilities.sysdyn and b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Tourists Environments And Hotel Facilities.sysdyn differ