Merged trunk@30159, @30162 to branches/sysdyn-1.8 on 2014-10-16 for 1.8.2 release.

refs #5244

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/1.8@30418 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.feature/feature.xml b/org.simantics.sysdyn.feature/feature.xml
index 3aac23110a1807c95a02e60b7a550242eec32167..fe512f8ff3594e922b867e4b6763c08d9b5c0367 100644 (file)
--- a/org.simantics.sysdyn.feature/feature.xml
+++ b/org.simantics.sysdyn.feature/feature.xml
@@ -135,6 +135,9 @@
 \r
    <plugin\r
          id="org.simantics.fmu.me.win32"\r
+         os="win32"\r
+         ws="win32"\r
+         arch="x86"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"/>\r
@@ -153,4 +156,13 @@
          version="0.0.0"\r
          unpack="false"/>\r
 \r
+   <plugin\r
+         id="org.simantics.fmu.me.win64"\r
+         os="win32"\r
+         ws="win32"\r
+         arch="x86_64"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"/>\r
+\r
 </feature>\r

diff --git a/org.simantics.sysdyn.feature/rootfiles/molecules/Smooth.sysdynModule b/org.simantics.sysdyn.feature/rootfiles/molecules/Smooth.sysdynModule
index 450f52c2c9f0e68666485169001f649f1566c859..bff4f200f431374ba9e4e645d6fce18f7b119e4a 100644 (file)
Binary files a/org.simantics.sysdyn.feature/rootfiles/molecules/Smooth.sysdynModule and b/org.simantics.sysdyn.feature/rootfiles/molecules/Smooth.sysdynModule differ