refs/heads/axrichard/modelmergeui - emfcompare/org.eclipse.emf.compare

commit: 85b7a87c67712f20242452353f64c0b562389aa1
[log]
author: Axel Richard <axel.richard@obeo.fr>
Tue May 21 17:55:05 2013 +0200
committer: Axel Richard <axel.richard@obeo.fr>
Tue May 21 17:55:05 2013 +0200
tree: fb9f5142c5c3639c3610672e941f95c89b2d580a
parent: 5f1687db0ac7d46b231ca7e75e44c360e08efdde [diff]

[398361] Model Merge UI

New model merge UI

plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java[diff]
plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/OverlayImageProvider.java[diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java[diff]
plugins/org.eclipse.emf.compare.rcp.ui/icons/full/toolb16/accept_change.gif[Added - diff]
plugins/org.eclipse.emf.compare.rcp.ui/icons/full/toolb16/reject_change.gif[Added - diff]
plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties[diff]
plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml[diff]
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/handler/AcceptChange.java[Added - diff]
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/handler/AcceptRejectChange.java[Added - diff]
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/handler/AcceptRejectChangePropertyTester.java[Added - diff]
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/handler/RejectChange.java[Added - diff]
plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF[diff]
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/IMergeData.java[Added - diff]
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/MergeDataAdapter.java[Added - diff]
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java[diff]
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java[diff]

16 files changed

tree: fb9f5142c5c3639c3610672e941f95c89b2d580a

org.eclipse.emf.compare-parent/
packaging/
plugins/
.gitignore