| commit | 74de768027a4abbb812699f5a8be794303efa04f | [log] [tgz] |
|---|---|---|
| author | Eugen Neufeld <eneufeld@eclipsesource.com> | Thu Jun 13 15:54:52 2019 +0200 |
| committer | Eugen Neufeld <eneufeld@eclipsesource.com> | Thu Jun 13 15:57:59 2019 +0200 |
| tree | db93c73b3991ce3711211fb1a64e4d53c89584a9 | |
| parent | 5e7acbba5aaa03f9a36d14696609eda76a579ea8 [diff] | |
| parent | e88186369455e4bef0fed8d305d6663b8e4a5cf8 [diff] |
Merge remote-tracking branch 'origin/release_1.21.0' into develop Conflicts: examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF releng/org.eclipse.emf.ecp.repository.target/category.xml tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF Change-Id: Ic55917318de72f701bbe78282884aefa92094b5d Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>