Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2019-09-06 14:42:22 +0000
committerOlivier Constant2019-09-09 08:05:13 +0000
commitad5cd3a0c91f009e1da0055ed79f803e34ac7b02 (patch)
tree0dfaed624d44635be6c1db16cdc9dc64a32ca4b8 /plugins/org.eclipse.emf.diffmerge.ui/plugin.properties
parentb58be096bccfeb8216982e4e770766d92e15612a (diff)
parentc18870f7b2b83ee5255fd2a2e393a620885b05d4 (diff)
downloadorg.eclipse.emf.diffmerge.core-ad5cd3a0c91f009e1da0055ed79f803e34ac7b02.tar.gz
org.eclipse.emf.diffmerge.core-ad5cd3a0c91f009e1da0055ed79f803e34ac7b02.tar.xz
org.eclipse.emf.diffmerge.core-ad5cd3a0c91f009e1da0055ed79f803e34ac7b02.zip
Merge branch 'master' into generic
Conflicts: plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryManager.java plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/UnmatchedElementCategory.java releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product Change-Id: I245f43dfdf549ed428446ab451c38c54e84df6e2 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'plugins/org.eclipse.emf.diffmerge.ui/plugin.properties')
0 files changed, 0 insertions, 0 deletions

Back to the top