Merge commit '25b6c25959c1fb3c60bb41cd0e1f0808e7fc3769'

diff --git a/bundles/org.simantics.scl.ui/plugin.xml b/bundles/org.simantics.scl.ui/plugin.xml
index 3a852b36799189dcdd6dd877bfdf281af7495b4d..2a2f3d934e5975f2fe03ed1d4bbbd4def0f8a45e 100755 (executable)
--- a/bundles/org.simantics.scl.ui/plugin.xml
+++ b/bundles/org.simantics.scl.ui/plugin.xml
@@ -75,10 +75,6 @@
                style="push">\r
          </command>\r
       </menuContribution>\r
-      <menuContribution\r
-            allPopups="false"\r
-            locationURI="org.simantics.scl.ui.menuContribution1">\r
-      </menuContribution>\r
    </extension>\r
    <extension\r
          point="org.eclipse.ui.commands">\r

diff --git a/bundles/org.simantics.utils.datastructures/build.properties b/bundles/org.simantics.utils.datastructures/build.properties
index 12cb67a4b5e6668a45bbf3c3437398f614478077..05d60ae9b66d7635346e187c9b81cf3276d01a23 100644 (file)
--- a/bundles/org.simantics.utils.datastructures/build.properties
+++ b/bundles/org.simantics.utils.datastructures/build.properties
@@ -12,5 +12,4 @@
 source.. = src/\r
 output.. = bin/\r
 bin.includes = META-INF/,\\r
-               .\r
-\r
+               .

diff --git a/bundles/org.simantics/build.properties b/bundles/org.simantics/build.properties
index 6f20375d6c7d98fbc80bb5da99be9866b1fe2f73..09aecee3087ccda15f65bd1f917e1f68254e0e5c 100644 (file)
--- a/bundles/org.simantics/build.properties
+++ b/bundles/org.simantics/build.properties
@@ -2,4 +2,4 @@ source.. = src/
 output.. = bin/\r
 bin.includes = META-INF/,\\r
                .,\\r
-               plugin.xml\r
+               plugin.xml,\\r

diff --git a/bundles/winterwell.markdown/build.properties b/bundles/winterwell.markdown/build.properties
index 7c6d8104468fa0d6ca61a05912bffee67ef53044..a836df1a4054709778a193fdfb0835b62e9dc091 100644 (file)
--- 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,\