Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-05-20 10:20:05 +0000
committerEike Stepper2015-05-20 10:33:56 +0000
commit26f3832ce0f83af27ebfc763d24b526c02b207e6 (patch)
treed81806e5c849224e7248dd12b23adf63a6126136 /plugins/org.eclipse.emf.cdo.explorer.ui
parente5a4f78c481f623858f6cb4ca9d6c3890ab7025a (diff)
downloadcdo-26f3832ce0f83af27ebfc763d24b526c02b207e6.tar.gz
cdo-26f3832ce0f83af27ebfc763d24b526c02b207e6.tar.xz
cdo-26f3832ce0f83af27ebfc763d24b526c02b207e6.zip
[467442] Add Interactive Transaction Conflict Resolution
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=467442
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.explorer.ui')
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/.settings/.api_filters8
1 files changed, 8 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/.api_filters
index 3d7a543003..99d40c0b79 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/.api_filters
@@ -8,6 +8,14 @@
</message_arguments>
</filter>
</resource>
+ <resource path="src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutEditorOpenerRegistry.java" type="org.eclipse.emf.cdo.explorer.ui.checkouts.CDOCheckoutEditorOpenerRegistry">
+ <filter id="571473929">
+ <message_arguments>
+ <message_argument value="Registry"/>
+ <message_argument value="CDOCheckoutEditorOpenerRegistry"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/NewActionProvider.java" type="org.eclipse.emf.cdo.explorer.ui.checkouts.actions.NewActionProvider">
<filter id="574664731">
<message_arguments>

Back to the top