Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-07-07 09:13:29 +0000
committerEike Stepper2010-07-07 09:13:29 +0000
commit03ae5c2a69e514023606bb249b8cfec736a3f4d6 (patch)
treea9224017cedede66c8933751da54e32d6a260b4b /plugins/org.eclipse.emf.cdo.server.objectivity.stub
parent55da57811c46e00d189fd8c240d64a35561ca102 (diff)
downloadcdo-03ae5c2a69e514023606bb249b8cfec736a3f4d6.tar.gz
cdo-03ae5c2a69e514023606bb249b8cfec736a3f4d6.tar.xz
cdo-03ae5c2a69e514023606bb249b8cfec736a3f4d6.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.server.objectivity.stub')
-rw-r--r--plugins/org.eclipse.emf.cdo.server.objectivity.stub/.settings/.api_filters11
1 files changed, 11 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity.stub/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server.objectivity.stub/.settings/.api_filters
new file mode 100644
index 0000000000..f9b693c521
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity.stub/.settings/.api_filters
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.emf.cdo.server.objectivity.stub" 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-1655"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>

Back to the top