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-frame.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html17
1 files changed, 17 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html
index c5465c7df8..3dd42d517f 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html
@@ -125,6 +125,10 @@ Classes</FONT>&nbsp;
<BR>
<A HREF="DefaultCDOMerger.PerFeature.ManyValued.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.PerFeature.ManyValued</A>
<BR>
+<A HREF="DefaultCDOMerger.PerFeature.ManyValued.Element.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.PerFeature.ManyValued.Element</A>
+<BR>
+<A HREF="DefaultCDOMerger.PerFeature.ManyValued.PerSide.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.PerFeature.ManyValued.PerSide</A>
+<BR>
<A HREF="FSMUtil.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">FSMUtil</A>
<BR>
<A HREF="InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">InternalCDOSession.MergeData</A>
@@ -141,6 +145,19 @@ Classes</FONT>&nbsp;
<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
<TR>
<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
+Enums</FONT>&nbsp;
+<FONT CLASS="FrameItemFont">
+<BR>
+<A HREF="DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.PerFeature.ManyValued.Side</A>
+<BR>
+<A HREF="DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.ResolutionPreference</A></FONT></TD>
+</TR>
+</TABLE>
+
+
+<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+<TR>
+<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
Exceptions</FONT>&nbsp;
<FONT CLASS="FrameItemFont">
<BR>

Back to the top