| commit | cebb6e8db0834e180b29134fb021be6e129864dd | [log] [tgz] |
|---|---|---|
| author | Johannes Faltermeier <jfaltermeier@eclipsesource.com> | Mon Jun 29 10:39:54 2015 +0200 |
| committer | Johannes Faltermeier <jfaltermeier@eclipsesource.com> | Mon Jun 29 10:39:54 2015 +0200 |
| tree | 22ca9675c9103cae2e58ab2a0bbbdda1406403a7 | |
| parent | f715ceb1082a017c361711ce7d8c0a1e8c8a225c [diff] | |
| parent | e5d177ab07d84eac0037d7040d984865d44ccb16 [diff] |
Merge branch 'hotfix_1.6.1' Conflicts: features/org.eclipse.emf.ecp.graphiti.feature/feature.xml features/org.eclipse.emf.ecp.view.indexdmr.feature/feature.xml features/org.eclipse.emf.ecp.view.mappingdmr.feature/feature.xml features/org.eclipse.emf.ecp.view.model.feature/feature.xml