Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html18
1 files changed, 18 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html
index eed1372898..8cf476367e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html
@@ -398,6 +398,24 @@ Classes in <A HREF="../../../../../org/eclipse/emf/spi/cdo/package-summary.html"
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;If the meaning of this type isn't clear, there really should be more of a description here...</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.PerSide.html#org.eclipse.emf.spi.cdo"><B>DefaultCDOMerger.PerFeature.ManyValued.PerSide</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Holds data for the source and target sides.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.Side.html#org.eclipse.emf.spi.cdo"><B>DefaultCDOMerger.PerFeature.ManyValued.Side</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.ResolutionPreference.html#org.eclipse.emf.spi.cdo"><B>DefaultCDOMerger.ResolutionPreference</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Enumerates the possible resolution preferences that can be used with a <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html" title="class in org.eclipse.emf.spi.cdo"><CODE>DefaultCDOMerger</CODE></A>.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/class-use/InternalCDOLoadable.html#org.eclipse.emf.spi.cdo"><B>InternalCDOLoadable</B></A></B>
<BR>

Back to the top