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.rcp | |
| 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.rcp')
| -rw-r--r-- | plugins/org.gastro.rcp/.settings/.api_filters | 11 | ||||
| -rw-r--r-- | plugins/org.gastro.rcp/META-INF/MANIFEST.MF | 16 |
2 files changed, 8 insertions, 19 deletions
diff --git a/plugins/org.gastro.rcp/.settings/.api_filters b/plugins/org.gastro.rcp/.settings/.api_filters deleted file mode 100644 index bbe43b1a35..0000000000 --- a/plugins/org.gastro.rcp/.settings/.api_filters +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<component id="org.gastro.rcp" version="2"> - <resource path="META-INF/MANIFEST.MF"> - <filter id="924844039"> - <message_arguments> - <message_argument value="3.0.100.qualifier"/> - <message_argument value="3.0.0.v20100614-1656"/> - </message_arguments> - </filter> - </resource> -</component> diff --git a/plugins/org.gastro.rcp/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp/META-INF/MANIFEST.MF index 22a7c39fe8..9205ad6143 100644 --- a/plugins/org.gastro.rcp/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.rcp/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CDO Gastro Example RCP Bundle-SymbolicName: org.gastro.rcp; singleton:=true -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.gastro.internal.rcp.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.tcp;bundle-version="[2.0.0,4.0.0)";visibility:=reexport, org.eclipse.ui;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, org.eclipse.emf.edit.ui;bundle-version="2.5.0";visibility:=reexport, - org.gastro.business;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.gastro.business.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.gastro.inventory.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.gastro.business;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.gastro.business.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.gastro.inventory;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.gastro.inventory.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.nebula.animation;version="0.5.2", @@ -21,8 +21,8 @@ Export-Package: org.eclipse.nebula.animation;version="0.5.2", org.eclipse.nebula.jface.galleryviewer;version="0.5.2", org.eclipse.nebula.widgets.gallery;version="0.5.2", org.eclipse.nebula.widgets.pshelf;version="1.0.0", - org.gastro.internal.rcp;version="3.0.100";x-internal:=true, - org.gastro.rcp;version="3.0.100" + org.gastro.internal.rcp;version="4.0.0";x-internal:=true, + org.gastro.rcp;version="4.0.0" Bundle-ClassPath: ., org.eclipse.nebula.widgets.pshelf_1.0.0.HEAD.jar, org.eclipse.nebula.widgets.gallery_0.5.2.R_0_20090418.jar |