| commit | 96d0fdba1deb380cff0b8a3ec18b9fb1120400e7 | [log] [tgz] |
|---|---|---|
| author | Dennis Wagelaar <dwagelaar@gmail.com> | Mon Oct 16 11:51:03 2017 +0200 |
| committer | Dennis Wagelaar <dwagelaar@gmail.com> | Mon Oct 16 11:51:03 2017 +0200 |
| tree | f008eaf0c092762e4dbbc718981254ac821188d9 | |
| parent | 2dab64d71d280c455351336d31ffe89650271d29 [diff] | |
| parent | c45d6245e94da56678194e6b053f2978dcdcc50b [diff] |
Merge remote-tracking branch 'origin/master' into bugs/415863-multiple_dispatch Conflicts: plugins/org.eclipse.m2m.atl.emftvm/META-INF/MANIFEST.MF