From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 12 Aug 2016 21:41:18 +0000 (+0300)
Subject: Merge branch 'master' of ssh://www.simantics.org:29417/simantics/platform
X-Git-Tag: v1.25.0~183
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=6e1a95d974ec09db0f8c52fed5dbb0211a232edb;hp=-c

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

6e1a95d974ec09db0f8c52fed5dbb0211a232edb
diff --combined bundles/pom.xml
index 4641096f8,196190420..bd57a96fe
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@@ -23,19 -23,19 +23,19 @@@
                      <compilerArgument>-err:-forbidden</compilerArgument>
                  </configuration>
              </plugin>
 -	    <plugin>
 -	      <groupId>org.eclipse.tycho</groupId>
 -	      <artifactId>tycho-source-plugin</artifactId>
 -	      <version>${tycho.version}</version>
 -	      <executions>
 -		<execution>
 -		  <id>plugin-source</id>
 -		  <goals>
 -		    <goal>plugin-source</goal>
 -		  </goals>
 -		</execution>
 -	      </executions>
 -	    </plugin>
 +            <plugin>
 +                <groupId>org.eclipse.tycho</groupId>
 +                <artifactId>tycho-source-plugin</artifactId>
 +                <version>${tycho.version}</version>
 +                <executions>
 +                    <execution>
 +                        <id>plugin-source</id>
 +                        <goals>
 +                            <goal>plugin-source</goal>
 +                        </goals>
 +                    </execution>
 +                </executions>
 +            </plugin>
          </plugins>
      </build>
  
@@@ -95,7 -95,7 +95,7 @@@
          <module>org.simantics.document.ui.ontology</module>
          <module>org.simantics.dublincore.ontology</module>
          <module>org.simantics.editors</module>
-         <module>org.simantics.editors.win32</module>
+  <!--       <module>org.simantics.editors.win32</module>-->
          <module>org.simantics.equation</module>
          <module>org.simantics.event</module>
          <module>org.simantics.event.ontology</module>