Merge branch 'master' of ssh://www.simantics.org:29417/simantics/platform

diff --combined bundles/pom.xml
index 4641096f897c74ba92b63b4fac16e5afff9ffd03,19619042071ca4fd8a5d95163def586a8ebb4427..bd57a96febe2bba2247239d86578b8fee064df8b
--- 1/bundles/pom.xml
--- 2/bundles/pom.xml
+++ b/bundles/pom.xml
@@@ -23,19 -23,19 +23,19 @@@
                      <compilerArgument>-err:-forbidden</compilerArgument>\r
                  </configuration>\r
              </plugin>\r
 -          <plugin>\r
 -            <groupId>org.eclipse.tycho</groupId>\r
 -            <artifactId>tycho-source-plugin</artifactId>\r
 -            <version>${tycho.version}</version>\r
 -            <executions>\r
 -              <execution>\r
 -                <id>plugin-source</id>\r
 -                <goals>\r
 -                  <goal>plugin-source</goal>\r
 -                </goals>\r
 -              </execution>\r
 -            </executions>\r
 -          </plugin>\r
 +            <plugin>\r
 +                <groupId>org.eclipse.tycho</groupId>\r
 +                <artifactId>tycho-source-plugin</artifactId>\r
 +                <version>${tycho.version}</version>\r
 +                <executions>\r
 +                    <execution>\r
 +                        <id>plugin-source</id>\r
 +                        <goals>\r
 +                            <goal>plugin-source</goal>\r
 +                        </goals>\r
 +                    </execution>\r
 +                </executions>\r
 +            </plugin>\r
          </plugins>\r
      </build>\r
  \r
@@@ -95,7 -95,7 +95,7 @@@
          <module>org.simantics.document.ui.ontology</module>\r
          <module>org.simantics.dublincore.ontology</module>\r
          <module>org.simantics.editors</module>\r
-         <module>org.simantics.editors.win32</module>\r
+  <!--       <module>org.simantics.editors.win32</module>-->\r
          <module>org.simantics.equation</module>\r
          <module>org.simantics.event</module>\r
          <module>org.simantics.event.ontology</module>\r