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.dawn.examples.acore.edit
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.dawn.examples.acore.edit')
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF
index 538f3e1f3c..89953b0ebd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.edit;singleton:=true
-Bundle-Version: 0.2.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.cdo.dawn.examples.acore.provider.AcoreEditPlugin$Implementation
Bundle-Vendor: %providerName
@@ -10,6 +10,6 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.provider;version="0.2.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.emf.cdo.dawn.examples.acore;bundle-version="[0.2.0,1.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.dawn.examples.acore;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.6.0,3.0.0)";visibility:=reexport
Bundle-ActivationPolicy: lazy

Back to the top