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.eclipse.emf.cdo.dawn.ui | |
| 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.eclipse.emf.cdo.dawn.ui')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF index 48429d4796..d3476d4929 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-Version: 0.2.100.qualifier Bundle-Activator: org.eclipse.emf.cdo.dawn.ui.Activator Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", - org.eclipse.emf.cdo.ui;bundle-version="[3.0.0,4.0.0)", + org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.dawn.util;bundle-version="[0.2.0,1.0.0)", - org.eclipse.emf.cdo.dawn;bundle-version="[0.2.0,1.0.0)" + org.eclipse.emf.cdo.dawn;bundle-version="[1.0.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName |