From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Mon, 29 Aug 2016 10:36:04 +0000 (+0300)
Subject: Merge commit '25b6c25959c1fb3c60bb41cd0e1f0808e7fc3769'
X-Git-Tag: v1.25.0~145
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=976581876c7f7b734d57d1c70cf4b309006c8b52;hp=3c9ab161a5c118fe740ab42c8a33ad672081d0d7

Merge commit '25b6c25959c1fb3c60bb41cd0e1f0808e7fc3769'
---

diff --git a/bundles/org.simantics.scl.ui/plugin.xml b/bundles/org.simantics.scl.ui/plugin.xml
index 3a852b367..2a2f3d934 100755
--- a/bundles/org.simantics.scl.ui/plugin.xml
+++ b/bundles/org.simantics.scl.ui/plugin.xml
@@ -75,10 +75,6 @@
                style="push">
          </command>
       </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="org.simantics.scl.ui.menuContribution1">
-      </menuContribution>
    </extension>
    <extension
          point="org.eclipse.ui.commands">
diff --git a/bundles/org.simantics.utils.datastructures/build.properties b/bundles/org.simantics.utils.datastructures/build.properties
index 12cb67a4b..05d60ae9b 100644
--- a/bundles/org.simantics.utils.datastructures/build.properties
+++ b/bundles/org.simantics.utils.datastructures/build.properties
@@ -12,5 +12,4 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
-
+               .
diff --git a/bundles/org.simantics/build.properties b/bundles/org.simantics/build.properties
index 6f20375d6..09aecee30 100644
--- a/bundles/org.simantics/build.properties
+++ b/bundles/org.simantics/build.properties
@@ -2,4 +2,4 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml
+               plugin.xml,\
diff --git a/bundles/winterwell.markdown/build.properties b/bundles/winterwell.markdown/build.properties
index 7c6d81044..a836df1a4 100644
--- a/bundles/winterwell.markdown/build.properties
+++ b/bundles/winterwell.markdown/build.properties
@@ -5,7 +5,6 @@ bin.includes = META-INF/,\
                .,\
                lib/
 src.includes = src/,\
-               plugin.xml,\
                icons/,\
                lib/,\
                .project,\