commit | 88d94d6a0589374c45f54159d8dcc66ea0745ebd | [log] [tgz] |
---|---|---|
author | Eugen Neufeld <eneufeld@eclipsesource.com> | Mon Mar 27 09:51:36 2017 +0200 |
committer | Eugen Neufeld <eneufeld@eclipsesource.com> | Mon Mar 27 09:51:36 2017 +0200 |
tree | e65cc82a72e94a7fdc1c4798191458861aa50a5d | |
parent | 0322f918bcd07a8618233390a38aad03f61aa10a [diff] | |
parent | 67f0ca798165b4abc0bccbff79c83948ff07cef7 [diff] |
Merge branch 'release_1.12.0' # Conflicts: # features/org.eclipse.emf.ecp.all.feature/feature.xml Change-Id: I99aa832e3f851fa3e5e51c0f8c55b5b4964e1e76 Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>