From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Tue, 16 Aug 2016 11:08:02 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/svn'
X-Git-Tag: v1.25.0~174
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=c1e8357dfbda3a12efbe2243a505200beb9aed71

Merge remote-tracking branch 'origin/svn'

Change-Id: Ib64bce0e85c78300c078f16a948d9db2f4872ed5
---

c1e8357dfbda3a12efbe2243a505200beb9aed71
diff --cc features/org.simantics.desktop.feature/feature.xml
index d29ccac34,d29ccac34..ee8db3761
--- a/features/org.simantics.desktop.feature/feature.xml
+++ b/features/org.simantics.desktop.feature/feature.xml
@@@ -26,7 -26,7 +26,7 @@@
           version="0.0.0"/>
  
     <includes
--         id="org.simantics.issues"
++         id="org.simantics.issues.feature"
           version="0.0.0"/>
  
     <includes
@@@ -34,7 -34,7 +34,7 @@@
           version="0.0.0"/>
  
     <includes
--         id="org.simantics.issues.ui"
++         id="org.simantics.issues.ui.feature"
           version="0.0.0"/>
  
     <includes
diff --cc features/org.simantics.g2d.feature/feature.xml
index 00eab1cb3,060e326e0..e3e9eb0d3
--- a/features/org.simantics.g2d.feature/feature.xml
+++ b/features/org.simantics.g2d.feature/feature.xml
@@@ -33,9 -33,13 +33,13 @@@
           version="0.0.0"/>
  
     <includes
 -         id="org.jfree"
 +         id="org.simantics.views.swt.feature"
           version="0.0.0"/>
  
+    <includes
 -         id="org.simantics.views.swt"
++         id="org.jfree"
+          version="0.0.0"/>
+ 
     <plugin
           id="org.simantics.scenegraph"
           download-size="0"