From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Mon, 5 Sep 2016 20:09:42 +0000 (+0300)
Subject: Merge commit '15f7f51'
X-Git-Tag: v1.25.0~137
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=87b6edd49f4370516d7f37bcb34c91324b95052c;hp=-c

Merge commit '15f7f51'
---

87b6edd49f4370516d7f37bcb34c91324b95052c
diff --combined bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
index 561e41e10,10ad43d9a..76aec39f3
--- a/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
@@@ -32,7 -32,7 +32,7 @@@ Require-Bundle: org.simantics.project;b
   org.simantics.issues;bundle-version="1.1.0",
   org.simantics.document;bundle-version="1.0.0",
   org.simantics.graph.db;bundle-version="1.1.9",
 - org.bouncycastle;bundle-version="1.47.0",
 + org.bouncycastle.bcprov-jdk14;bundle-version="1.38.0",
   org.simantics.image2.ontology;bundle-version="1.1.0",
   org.simantics.scl.compiler;bundle-version="0.4.0",
   org.simantics.scl.compiler.dummy;bundle-version="1.0.0",
@@@ -60,7 -60,8 +60,8 @@@
   org.eclipse.swt,
   org.simantics.db.layer0,
   org.simantics.silk.ontology;bundle-version="1.1.0",
-  org.simantics.image.ui;bundle-version="1.0.0"
+  org.simantics.image.ui;bundle-version="1.0.0",
+  org.simantics.export.core;bundle-version="1.0.0"
  Export-Package: org.simantics.modeling.ui,
   org.simantics.modeling.ui.actions,
   org.simantics.modeling.ui.chart.property,