From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 9 Sep 2016 13:05:22 +0000 (+0300)
Subject: Merge commit '0e8cf1e'
X-Git-Tag: v1.25.0~131
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;ds=inline;h=23ea9f9235f428865dc4cd3bff6d3dd9e3174653;hp=-c;p=simantics%2Fplatform.git

Merge commit '0e8cf1e'
---

23ea9f9235f428865dc4cd3bff6d3dd9e3174653
diff --combined features/org.simantics.sdk.feature/feature.xml
index d7e7e3644,ee4a899a1..ed48ad311
--- a/features/org.simantics.sdk.feature/feature.xml
+++ b/features/org.simantics.sdk.feature/feature.xml
@@@ -49,7 -49,7 +49,7 @@@
           version="0.0.0"/>
  
     <includes
 -         id="org.simantics.utils.ui"
 +         id="org.simantics.utils.ui.feature"
           version="0.0.0"/>
  
     <includes
@@@ -97,19 -97,11 +97,19 @@@
           version="0.0.0"/>
  
     <includes
 -         id="org.simantics.issues"
 +         id="org.simantics.issues.feature"
           version="0.0.0"/>
  
     <includes
 -         id="org.simantics.issues.ui"
 +         id="org.simantics.issues.ui.feature"
 +         version="0.0.0"/>
 +
 +   <includes
 +         id="org.simantics.views.swt.client.feature"
 +         version="0.0.0"/>
 +
 +   <includes
 +         id="org.simantics.views.swt.feature"
           version="0.0.0"/>
  
     <includes
@@@ -121,7 -113,7 +121,7 @@@
           version="0.0.0"/>
  
     <includes
 -         id="org.simantics.event"
 +         id="org.simantics.event.feature"
           version="0.0.0"/>
  
     <includes
@@@ -129,7 -121,7 +129,7 @@@
           version="0.0.0"/>
  
     <includes
 -         id="org.simantics.wiki.ui"
 +         id="org.simantics.wiki.ui.feature"
           version="0.0.0"/>
  
     <includes
@@@ -152,4 -144,18 +152,18 @@@
           id="org.simantics.document.linking"
           version="0.0.0"/>
  
+    <plugin
+          id="org.simantics.fileimport"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+ 
+    <plugin
+          id="org.simantics.fileimport.ui"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+ 
  </feature>