tree 22ca9675c9103cae2e58ab2a0bbbdda1406403a7
parent f715ceb1082a017c361711ce7d8c0a1e8c8a225c
parent e5d177ab07d84eac0037d7040d984865d44ccb16
author Johannes Faltermeier <jfaltermeier@eclipsesource.com> 1435567194 +0200
committer Johannes Faltermeier <jfaltermeier@eclipsesource.com> 1435567194 +0200

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