Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Redor2014-03-03 14:14:59 +0000
committerLaurent Redor2014-03-03 15:17:47 +0000
commit092d76dae498abb31813f886e7d8da54a770f4b0 (patch)
tree65eb24a4b36668827154a20fef38ff5c7b8ff9c8 /plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF
parentafa9b6af2afd8e18275e873deeb26d40ddb1eb45 (diff)
parent9efe3b1caf049d01fd1e464d4bb80248609fdd35 (diff)
downloadorg.eclipse.sirius-092d76dae498abb31813f886e7d8da54a770f4b0.tar.gz
org.eclipse.sirius-092d76dae498abb31813f886e7d8da54a770f4b0.tar.xz
org.eclipse.sirius-092d76dae498abb31813f886e7d8da54a770f4b0.zip
Merge branch 'master' into bug/427803_moveDiagramEcoreInItsOwnPlugin
Conflicts: plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/refresh/listeners/GMFDiagramUpdater.java plugins/org.eclipse.sirius.doc/doc/Release Notes.html plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/deletehook/DeleteHookIdPropertySection.java plugins/org.eclipse.sirius.sample.ecore.design/META-INF/MANIFEST.MF plugins/org.eclipse.sirius/model/viewpoint.genmodel plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/display/VisibilityPropagatorAdapter.java plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/ViewpointRegistry.java Change-Id: I7178ed1a9fcbd84295e02eb258710c8fbdcb5531 Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF')
-rw-r--r--plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF
index 323bf6aa70..23ff0695ae 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF
@@ -43,7 +43,7 @@ Export-Package: org.eclipse.sirius.diagram.sequence;version="1.0.0",
org.eclipse.sirius.diagram.sequence.util;version="1.0.0"
Require-Bundle: org.eclipse.sirius.common;bundle-version="1.0.0",
org.eclipse.sirius.ecore.extender;bundle-version="1.0.0",
- com.google.guava;bundle-version="[11.0.0,12.0.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
org.eclipse.gmf.runtime.draw2d.ui;bundle-version="1.0.101",
org.eclipse.draw2d;bundle-version="3.9.0",

Back to the top