diff options
| author | Axel Richard | 2013-05-21 15:55:05 +0000 |
|---|---|---|
| committer | Mikaël Barbero | 2013-06-27 20:18:44 +0000 |
| commit | e249f7f4ef4fbfa75f5f7bcfb407784a2bbe1d7e (patch) | |
| tree | 82277280e364cdf5920ceed406b973605b3e3467 /plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF | |
| parent | 68a39767bef4abb768055e6fc0b33618438fb620 (diff) | |
| download | org.eclipse.emf.compare-e249f7f4ef4fbfa75f5f7bcfb407784a2bbe1d7e.tar.gz org.eclipse.emf.compare-e249f7f4ef4fbfa75f5f7bcfb407784a2bbe1d7e.tar.xz org.eclipse.emf.compare-e249f7f4ef4fbfa75f5f7bcfb407784a2bbe1d7e.zip | |
[398361] Enhanced Model Merge UI
- Add new Ruler next to StructureMergeViewer
- When select diff in StructureMergeViewer, highlight required and
unmergeable diffs,
and create annotations in Ruler
- Add new merge and navigation actions in StructureMergeViewer toolbar.
- Delete old merge and navigation actions in ContentMergeViewer toolbar.
Bug: 398361
Change-Id: I3d43fe9c4938404361f835e93631ed744a2c4377
Diffstat (limited to 'plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF')
| -rw-r--r-- | plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF index 6f1c8b284..10caf73a8 100644 --- a/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF @@ -13,6 +13,7 @@ Export-Package: org.eclipse.emf.compare, org.eclipse.emf.compare.equi, org.eclipse.emf.compare.impl, org.eclipse.emf.compare.internal;x-friends:="org.eclipse.emf.compare.logical,org.eclipse.emf.compare.ide", + org.eclipse.emf.compare.internal.merge;x-friends:="org.eclipse.emf.compare.rcp.ui,org.eclipse.emf.compare.edit,org.eclipse.emf.compare.ide.ui", org.eclipse.emf.compare.internal.postprocessor.factories;x-internal:=true, org.eclipse.emf.compare.internal.spec;x-friends:="org.eclipse.emf.compare.tests", org.eclipse.emf.compare.internal.utils; |