refs/heads/13x - edapt/org.eclipse.emf.edapt

commit: d56b2b7f555d9e3c1e524754783a04fc4400388a
[log] [tgz]
author: Johannes Faltermeier <jfaltermeier@eclipsesource.com>
Thu Nov 08 16:03:59 2018 +0100
committer: Johannes Faltermeier <jfaltermeier@eclipsesource.com>
Thu Nov 08 16:03:59 2018 +0100
tree: da8bf7ff606ee9883add1ae0393183b1b5aa09a3
parent: b9c8f3cd812ff86a39763043200f2a412cc16c61 [diff]
parent: 0bd845c0c424a3d78f94103e2c3158de697fe98e [diff]

Merge remote-tracking branch 'origin/develop' into 13x

# Conflicts:
#	tests/org.eclipse.emf.edapt.common.tests/META-INF/MANIFEST.MF

Change-Id: I16f917780905f8d0e7e2db5ef9f05a2a93396d5d
Signed-off-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>

tree: da8bf7ff606ee9883add1ae0393183b1b5aa09a3

builds/
examples/
features/
plugins/
tests/
.gitignore
CONTRIBUTING
LICENSE
NOTICE