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=3184a1f9ee51fe1c3fa6baaa42bc5a1412cf2761

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

diff --git a/bundles/pom.xml b/bundles/pom.xml
index 4641096f8..bd57a96fe 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -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>