tree 9e108e4da1287bf7bff8cb8169ca2154eaba1e5d
parent acf4074b71759748f778997cb9358309b2f4962a
parent 98a5a42de0c2fa8cdef01e009c3f21be90434bd7
author Grégoire Dupé <gdupe@mia-software.com> 1487061036 +0100
committer Grégoire Dupé <gdupe@mia-software.com> 1487061036 +0100

Merge branch 'maintenance-1.0'

Conflicts:
	org.eclipse.modisco.archi.tech.targetplatform/org.eclipse.modisco.archi.tech.targetplatform.target
	org.eclipse.modisco.examples.feature/feature.xml
	org.eclipse.modisco.infra.cdo.derby.feature/feature.xml
	org.eclipse.modisco.infra.discovery.benchmark.feature/feature.xml
	org.eclipse.modisco.infra.omg.feature/feature.xml
	org.eclipse.modisco.infrastructure.feature/feature.xml
	org.eclipse.modisco.java.cdo.feature/feature.xml
	org.eclipse.modisco.java.discoverer.benchmark.feature/feature.xml
	org.eclipse.modisco.java.feature/feature.xml
	org.eclipse.modisco.jee.feature/feature.xml
	org.eclipse.modisco.sdk.feature/feature.xml
	org.eclipse.modisco.usecase.modelfilter.feature/feature.xml
	org.eclipse.modisco.usecase.simpletransformationschain.feature/feature.xml
	org.eclipse.modisco.utils.chart.feature/feature.xml
	org.eclipse.modisco.xml.feature/feature.xml

Change-Id: I4c5ff741692b1842d189039f2ab6c61706d3160f