diff options
| author | Mikaël Barbero | 2013-05-13 12:09:17 +0000 |
|---|---|---|
| committer | Mikaël Barbero | 2013-05-13 15:02:55 +0000 |
| commit | 79cb2b3291b1e9e2c784ab707444aae90e663539 (patch) | |
| tree | 92f7116fb0e508fbce9c7f10c81ecb34df407b84 | |
| parent | c586e73162011ef4c7194dab5a9771e2cb1df44e (diff) | |
| download | org.eclipse.emf.compare-79cb2b3291b1e9e2c784ab707444aae90e663539.tar.gz org.eclipse.emf.compare-79cb2b3291b1e9e2c784ab707444aae90e663539.tar.xz org.eclipse.emf.compare-79cb2b3291b1e9e2c784ab707444aae90e663539.zip | |
change the range for the #populateMenuManager fix
It has been fixed for kepler, the workaround must be there for juno
only.
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java index 91732d843..9d7d8e63e 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java @@ -584,7 +584,7 @@ public class EMFCompareStructureMergeViewer extends DiffTreeViewer implements Co Version junoStart = Version.parseVersion("3.103"); // XXX MBA change to 3.105 once bug #366528 is fixed - Version keplerStart = Version.parseVersion("3.106"); + Version keplerStart = Version.parseVersion("3.105"); if (uiWorkbenchBundle != null && uiWorkbenchBundle.getVersion().compareTo(junoStart) >= 0 && uiWorkbenchBundle.getVersion().compareTo(keplerStart) < 0) { |