Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-07-07 16:55:10 +0000
committerEike Stepper2010-07-07 16:55:10 +0000
commitc4d3ed8b70f2118652389b604a48c8846866f0ee (patch)
tree371a60f9a72c160a7e8ee7868ab2ab6b02a60c21 /plugins/org.eclipse.emf.cdo.ui.ide
parente226589b37d964e9d58de60b4ecdc8a66f52a96f (diff)
downloadcdo-c4d3ed8b70f2118652389b604a48c8846866f0ee.tar.gz
cdo-c4d3ed8b70f2118652389b604a48c8846866f0ee.tar.xz
cdo-c4d3ed8b70f2118652389b604a48c8846866f0ee.zip
[319090] Provide a CDOConflictResolver that uses a CDOMerger
https://bugs.eclipse.org/bugs/show_bug.cgi?id=319090
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui.ide')
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF16
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF
index 5d890331b1..917f35e9cf 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.ui.ide;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -10,14 +10,14 @@ Bundle-Activator: org.eclipse.emf.cdo.ui.internal.ide.bundle.OM$Activator
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.cdo.team;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.team;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.team.ui;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
org.eclipse.ui.navigator;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
org.eclipse.ui.navigator.resources;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.ui.ide;version="3.0.0",
- org.eclipse.emf.cdo.ui.internal.ide.actions;version="3.0.0";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.ide.bundle;version="3.0.0";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.ide.messages;version="3.0.0";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.ide.wizards;version="3.0.0";x-internal:=true
+ org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
+Export-Package: org.eclipse.emf.cdo.ui.ide;version="4.0.0",
+ org.eclipse.emf.cdo.ui.internal.ide.actions;version="4.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.ide.bundle;version="4.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.ide.messages;version="4.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.ide.wizards;version="4.0.0";x-internal:=true

Back to the top