commit	b1fa58b00d391ddb564a1c8b9987a17b00e0750b	[log] [tgz]
author	Philip Langer <planger@eclipsesource.com>	Fri Oct 20 14:25:40 2017 +0200
committer	Philip Langer <planger@eclipsesource.com>	Mon Nov 20 15:20:07 2017 +0100
tree	5a5795c7cb6784eac13052f133a8008b18d30f68
parent	40221a4d267017098a82d62aad93e2fdee684710 [diff]

Migrate Papyrus changes from EMF Compare change 105322

This change migrates the changes to Papyrus-related plug-ins from change
https://git.eclipse.org/r/#/c/105322/

Change-Id: I86bf7d9a3fb2850769b9ff31dab6470ac17a56bc
Signed-off-by: Philip Langer <planger@eclipsesource.com>

plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.java[diff]

1 file changed

tree: 5a5795c7cb6784eac13052f133a8008b18d30f68

README.MD

Papyrus Collaborative Modeling

This is the collaborative modeling git repository

This repository is hosted at [Eclipse] (http://git.eclipse.org/c/papyrus/org.eclipse.papyrus-collaborativemodeling.git/)