diff options
| author | Eike Stepper | 2010-07-07 16:55:10 +0000 |
|---|---|---|
| committer | Eike Stepper | 2010-07-07 16:55:10 +0000 |
| commit | c4d3ed8b70f2118652389b604a48c8846866f0ee (patch) | |
| tree | 371a60f9a72c160a7e8ee7868ab2ab6b02a60c21 /plugins/org.gastro.inventory.edit | |
| parent | e226589b37d964e9d58de60b4ecdc8a66f52a96f (diff) | |
| download | cdo-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.gastro.inventory.edit')
| -rw-r--r-- | plugins/org.gastro.inventory.edit/META-INF/MANIFEST.MF | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.gastro.inventory.edit/META-INF/MANIFEST.MF b/plugins/org.gastro.inventory.edit/META-INF/MANIFEST.MF index 1c48c3af1c..a839d58331 100644 --- a/plugins/org.gastro.inventory.edit/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.inventory.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gastro.inventory.edit;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.gastro.inventory.provider.InventoryEditPlugin$Implementation Bundle-Vendor: %providerName @@ -10,6 +10,6 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.gastro.inventory.provider;version="3.0.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.emf.cdo.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.gastro.inventory;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.emf.cdo.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.gastro.inventory;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy |