From: Tuukka Lehtonen Date: Fri, 16 Sep 2016 08:28:03 +0000 (+0300) Subject: Merge branch 'master' of ssh://www.simantics.org:29418/simantics/platform X-Git-Tag: v1.25.0~113 X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=abe6893036ad75927f61cfd542562d62ef3c5edc;hp=9b79343ca481f448a4bcdeb3c2b35af91c8dfb62 Merge branch 'master' of ssh://www.simantics.org:29418/simantics/platform --- diff --git a/bundles/org.simantics.action.ontology/graph.tg b/bundles/org.simantics.action.ontology/graph.tg index f33c2aa2c..4ce75ff74 100644 Binary files a/bundles/org.simantics.action.ontology/graph.tg and b/bundles/org.simantics.action.ontology/graph.tg differ diff --git a/bundles/org.simantics.annotation.ontology/graph.tg b/bundles/org.simantics.annotation.ontology/graph.tg index c4260ad42..2a28024a3 100644 Binary files a/bundles/org.simantics.annotation.ontology/graph.tg and b/bundles/org.simantics.annotation.ontology/graph.tg differ diff --git a/bundles/org.simantics.backup.ontology/graph.tg b/bundles/org.simantics.backup.ontology/graph.tg index bcb6d8562..db70f2a0e 100644 Binary files a/bundles/org.simantics.backup.ontology/graph.tg and b/bundles/org.simantics.backup.ontology/graph.tg differ diff --git a/bundles/org.simantics.browsing.ui.ontology/graph.tg b/bundles/org.simantics.browsing.ui.ontology/graph.tg index e12972894..6dbe35e69 100644 Binary files a/bundles/org.simantics.browsing.ui.ontology/graph.tg and b/bundles/org.simantics.browsing.ui.ontology/graph.tg differ diff --git a/bundles/org.simantics.charts.ontology/graph.tg b/bundles/org.simantics.charts.ontology/graph.tg index e5cfc80f5..f7506b993 100644 Binary files a/bundles/org.simantics.charts.ontology/graph.tg and b/bundles/org.simantics.charts.ontology/graph.tg differ diff --git a/bundles/org.simantics.datatypes.ontology/graph.tg b/bundles/org.simantics.datatypes.ontology/graph.tg index df7545aff..d4a8ba78f 100644 Binary files a/bundles/org.simantics.datatypes.ontology/graph.tg and b/bundles/org.simantics.datatypes.ontology/graph.tg differ diff --git a/bundles/org.simantics.desktop.ui.ontology/graph.tg b/bundles/org.simantics.desktop.ui.ontology/graph.tg index 02d354a20..33a3871fc 100644 Binary files a/bundles/org.simantics.desktop.ui.ontology/graph.tg and b/bundles/org.simantics.desktop.ui.ontology/graph.tg differ diff --git a/bundles/org.simantics.diagram.ontology/graph.tg b/bundles/org.simantics.diagram.ontology/graph.tg index 0a440442c..eda90ce84 100644 Binary files a/bundles/org.simantics.diagram.ontology/graph.tg and b/bundles/org.simantics.diagram.ontology/graph.tg differ diff --git a/bundles/org.simantics.document.base.ontology/graph.tg b/bundles/org.simantics.document.base.ontology/graph.tg index f98ba9855..c321d212c 100644 Binary files a/bundles/org.simantics.document.base.ontology/graph.tg and b/bundles/org.simantics.document.base.ontology/graph.tg differ diff --git a/bundles/org.simantics.document.linking.ontology/graph.tg b/bundles/org.simantics.document.linking.ontology/graph.tg index 626013f6a..0a92a9653 100644 Binary files a/bundles/org.simantics.document.linking.ontology/graph.tg and b/bundles/org.simantics.document.linking.ontology/graph.tg differ diff --git a/bundles/org.simantics.document.ontology/graph.tg b/bundles/org.simantics.document.ontology/graph.tg index 9c1b455d7..aadabaa9a 100644 Binary files a/bundles/org.simantics.document.ontology/graph.tg and b/bundles/org.simantics.document.ontology/graph.tg differ diff --git a/bundles/org.simantics.document.swt.ontology/graph.tg b/bundles/org.simantics.document.swt.ontology/graph.tg index e54faf727..fb597cc1c 100644 Binary files a/bundles/org.simantics.document.swt.ontology/graph.tg and b/bundles/org.simantics.document.swt.ontology/graph.tg differ diff --git a/bundles/org.simantics.dublincore.ontology/graph.tg b/bundles/org.simantics.dublincore.ontology/graph.tg index 9153239bf..357a686bd 100644 Binary files a/bundles/org.simantics.dublincore.ontology/graph.tg and b/bundles/org.simantics.dublincore.ontology/graph.tg differ diff --git a/bundles/org.simantics.g2d.ontology/graph.tg b/bundles/org.simantics.g2d.ontology/graph.tg index 362c08c07..b75d2eb3a 100644 Binary files a/bundles/org.simantics.g2d.ontology/graph.tg and b/bundles/org.simantics.g2d.ontology/graph.tg differ diff --git a/bundles/org.simantics.graphfile.ontology/graph.tg b/bundles/org.simantics.graphfile.ontology/graph.tg index 67308b2c6..4ef17332a 100644 Binary files a/bundles/org.simantics.graphfile.ontology/graph.tg and b/bundles/org.simantics.graphfile.ontology/graph.tg differ diff --git a/bundles/org.simantics.help.ontology/graph.tg b/bundles/org.simantics.help.ontology/graph.tg index 4cb13d035..376ab173e 100644 Binary files a/bundles/org.simantics.help.ontology/graph.tg and b/bundles/org.simantics.help.ontology/graph.tg differ diff --git a/bundles/org.simantics.image.ontology/graph.tg b/bundles/org.simantics.image.ontology/graph.tg index 94eee91ae..0eb99caa0 100644 Binary files a/bundles/org.simantics.image.ontology/graph.tg and b/bundles/org.simantics.image.ontology/graph.tg differ diff --git a/bundles/org.simantics.image2.ontology/graph.tg b/bundles/org.simantics.image2.ontology/graph.tg index c6c565455..c4ff92401 100644 Binary files a/bundles/org.simantics.image2.ontology/graph.tg and b/bundles/org.simantics.image2.ontology/graph.tg differ diff --git a/bundles/org.simantics.issues.ontology/graph.tg b/bundles/org.simantics.issues.ontology/graph.tg index d0fbbf128..23e0bb966 100644 Binary files a/bundles/org.simantics.issues.ontology/graph.tg and b/bundles/org.simantics.issues.ontology/graph.tg differ diff --git a/bundles/org.simantics.issues.ui.ontology/graph.tg b/bundles/org.simantics.issues.ui.ontology/graph.tg index 0397e7e78..50682c6e6 100644 Binary files a/bundles/org.simantics.issues.ui.ontology/graph.tg and b/bundles/org.simantics.issues.ui.ontology/graph.tg differ diff --git a/bundles/org.simantics.layer0/graph.tg b/bundles/org.simantics.layer0/graph.tg index 9be2e4f0b..b12db40eb 100644 Binary files a/bundles/org.simantics.layer0/graph.tg and b/bundles/org.simantics.layer0/graph.tg differ diff --git a/bundles/org.simantics.layer0x.ontology/graph.tg b/bundles/org.simantics.layer0x.ontology/graph.tg index 6463535e8..7a0e38445 100644 Binary files a/bundles/org.simantics.layer0x.ontology/graph.tg and b/bundles/org.simantics.layer0x.ontology/graph.tg differ diff --git a/bundles/org.simantics.ltk.antlr/META-INF/MANIFEST.MF b/bundles/org.simantics.ltk.antlr/META-INF/MANIFEST.MF index 99da36f06..0be675325 100644 --- a/bundles/org.simantics.ltk.antlr/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.ltk.antlr/META-INF/MANIFEST.MF @@ -5,5 +5,5 @@ Bundle-SymbolicName: org.simantics.ltk.antlr Bundle-Version: 1.1.10.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.simantics.ltk;bundle-version="1.0.0";visibility:=reexport, - org.antlr.runtime;bundle-version="3.2.0";visibility:=reexport + org.antlr.runtime;bundle-version="[3.2.0,4.0.0)";visibility:=reexport Export-Package: org.simantics.ltk.antlr diff --git a/bundles/org.simantics.modeling.ontology/graph.tg b/bundles/org.simantics.modeling.ontology/graph.tg index 129529592..bc546631a 100644 Binary files a/bundles/org.simantics.modeling.ontology/graph.tg and b/bundles/org.simantics.modeling.ontology/graph.tg differ diff --git a/bundles/org.simantics.modeling.template2d.ontology/graph.tg b/bundles/org.simantics.modeling.template2d.ontology/graph.tg index 85eb75fef..848ede327 100644 Binary files a/bundles/org.simantics.modeling.template2d.ontology/graph.tg and b/bundles/org.simantics.modeling.template2d.ontology/graph.tg differ diff --git a/bundles/org.simantics.platform.ui.ontology/graph.tg b/bundles/org.simantics.platform.ui.ontology/graph.tg index 03b6a0594..45c711d9c 100644 Binary files a/bundles/org.simantics.platform.ui.ontology/graph.tg and b/bundles/org.simantics.platform.ui.ontology/graph.tg differ diff --git a/bundles/org.simantics.project.ontology/graph.tg b/bundles/org.simantics.project.ontology/graph.tg index 85b931584..8f8ebc45b 100644 Binary files a/bundles/org.simantics.project.ontology/graph.tg and b/bundles/org.simantics.project.ontology/graph.tg differ diff --git a/bundles/org.simantics.scenegraph.ontology/graph.tg b/bundles/org.simantics.scenegraph.ontology/graph.tg index 2991c6e55..6033385d4 100644 Binary files a/bundles/org.simantics.scenegraph.ontology/graph.tg and b/bundles/org.simantics.scenegraph.ontology/graph.tg differ diff --git a/bundles/org.simantics.selectionview.ui.ontology/graph.tg b/bundles/org.simantics.selectionview.ui.ontology/graph.tg index 5ba15703c..a0f65152b 100644 Binary files a/bundles/org.simantics.selectionview.ui.ontology/graph.tg and b/bundles/org.simantics.selectionview.ui.ontology/graph.tg differ diff --git a/bundles/org.simantics.silk.ontology/graph.tg b/bundles/org.simantics.silk.ontology/graph.tg index c54a35e39..d27b28071 100644 Binary files a/bundles/org.simantics.silk.ontology/graph.tg and b/bundles/org.simantics.silk.ontology/graph.tg differ diff --git a/bundles/org.simantics.simulation.ontology/graph.tg b/bundles/org.simantics.simulation.ontology/graph.tg index b16b4cf73..b81869260 100644 Binary files a/bundles/org.simantics.simulation.ontology/graph.tg and b/bundles/org.simantics.simulation.ontology/graph.tg differ diff --git a/bundles/org.simantics.softwareconfiguration.ontology/graph.tg b/bundles/org.simantics.softwareconfiguration.ontology/graph.tg index 094d9f615..35f47e6bd 100644 Binary files a/bundles/org.simantics.softwareconfiguration.ontology/graph.tg and b/bundles/org.simantics.softwareconfiguration.ontology/graph.tg differ diff --git a/bundles/org.simantics.spreadsheet.ontology/graph.tg b/bundles/org.simantics.spreadsheet.ontology/graph.tg index 435b714aa..8ad7b0843 100644 Binary files a/bundles/org.simantics.spreadsheet.ontology/graph.tg and b/bundles/org.simantics.spreadsheet.ontology/graph.tg differ diff --git a/bundles/org.simantics.structural.ontology/graph.tg b/bundles/org.simantics.structural.ontology/graph.tg index 28ffbc465..fbe043eab 100644 Binary files a/bundles/org.simantics.structural.ontology/graph.tg and b/bundles/org.simantics.structural.ontology/graph.tg differ diff --git a/bundles/org.simantics.user.ontology/graph.tg b/bundles/org.simantics.user.ontology/graph.tg index 5196e4a49..59c26d0fe 100644 Binary files a/bundles/org.simantics.user.ontology/graph.tg and b/bundles/org.simantics.user.ontology/graph.tg differ diff --git a/bundles/org.simantics.viewpoint.ontology/graph.tg b/bundles/org.simantics.viewpoint.ontology/graph.tg index 3de5dabca..d3163ee7b 100644 Binary files a/bundles/org.simantics.viewpoint.ontology/graph.tg and b/bundles/org.simantics.viewpoint.ontology/graph.tg differ diff --git a/bundles/org.simantics.views.ontology/graph.tg b/bundles/org.simantics.views.ontology/graph.tg index a2ec73d89..fcd56da6f 100644 Binary files a/bundles/org.simantics.views.ontology/graph.tg and b/bundles/org.simantics.views.ontology/graph.tg differ diff --git a/bundles/org.simantics.workbench.ontology/graph.tg b/bundles/org.simantics.workbench.ontology/graph.tg index 22afc5f43..68a1b4c50 100644 Binary files a/bundles/org.simantics.workbench.ontology/graph.tg and b/bundles/org.simantics.workbench.ontology/graph.tg differ