Merge branch 'maintenance-0.12' into maintenance-0.13maintenance-0.13

Conflicts:
	.gitignore
	.project
	org.eclipse.gmt.modisco.examples/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.custom.core/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.custom.editor/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.custom.ui/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.custom/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.uicore/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.capabilities/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.common.cdo.derby/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.common.cdo/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.common.core/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.common.ui/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.discoverymanager/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.facet.core/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.facet.edit/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.facet.editor/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.facet.examples.kdm/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.facet.ui/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.facet/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.prefuse/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.query.core/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.query.edit/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.query.editor/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.query.jxpath/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.query.ui/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.query/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.browser.customization/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.cdo/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.classiceobject/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.discoverer/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.generation/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.nousages.cdo/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.nousages/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.queries/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.kdm.browser.extension/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.omg.kdm/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.omg.smm/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.tool.metricsvisualizationbuilder/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.workflow.mwe/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.workflow/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.xml.browser.customization/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.xml.discoverer/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.xml/META-INF/MANIFEST.MF
	org.eclipse.modisco.all.feature/feature.xml
	org.eclipse.modisco.archi.tech.targetplatform/org.eclipse.modisco.archi.tech.targetplatform.target
	org.eclipse.modisco.common.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.dev.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.doc.api.report/META-INF/MANIFEST.MF
	org.eclipse.modisco.doc.metric.report/META-INF/MANIFEST.MF
	org.eclipse.modisco.doc.test.report/META-INF/MANIFEST.MF
	org.eclipse.modisco.doc.test.report/pom.xsl
	org.eclipse.modisco.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.eclipseplugin.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.eclipseplugin.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.eclipseplugin/META-INF/MANIFEST.MF
	org.eclipse.modisco.examples.feature/feature.xml
	org.eclipse.modisco.infra.browser.custom.examples.generation/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.browser.custom.examples.uml.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.browser.custom.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.browser.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.cdo.derby.feature/feature.xml
	org.eclipse.modisco.infra.common.core.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.benchmark.core/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.benchmark.doc.archi/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.benchmark.feature/feature.xml
	org.eclipse.modisco.infra.discovery.benchmark.metamodel/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.benchmark.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.benchmark/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.core.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.core/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.ui.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discoverymanager.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.doc.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.facet.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.omg.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.omg.feature/feature.xml
	org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infrastructure.doc.archi/META-INF/MANIFEST.MF
	org.eclipse.modisco.infrastructure.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.infrastructure.feature/feature.xml
	org.eclipse.modisco.java.browser.customization.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.cdo.feature/feature.xml
	org.eclipse.modisco.java.composition.browser.customization/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.composition.discoverer.benchmark/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.composition.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.composition.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.composition.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.composition.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.composition/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer.benchmark.feature/feature.xml
	org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.doc.archi/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.feature/feature.xml
	org.eclipse.modisco.java.generation.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.queries.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.doc.archi/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.ejbjar.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.ejbjar.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.ejbjar.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.ejbjar/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.facet/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.feature/feature.xml
	org.eclipse.modisco.jee.jsp.browser.customization/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.jsp.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.jsp.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.jsp.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.jsp.generation/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.jsp/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.queries.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.queries/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.webapp.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.webapp.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.webapp.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.webapp/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.source.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.source.extension.ui.browser/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.source.extension.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.source.extension/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.uml2converter.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
	org.eclipse.modisco.manifest.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.manifest.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.manifest/META-INF/MANIFEST.MF
	org.eclipse.modisco.omg.gastm/META-INF/MANIFEST.MF
	org.eclipse.modisco.omg.smm/META-INF/MANIFEST.MF
	org.eclipse.modisco.properties.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.properties.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.releng.tycho/helios/releng.properties
	org.eclipse.modisco.releng.tycho/helios/targetPlatform.xml
	org.eclipse.modisco.releng.tycho/indigo/releng.properties
	org.eclipse.modisco.releng.tycho/indigo/targetPlatform.xml
	org.eclipse.modisco.releng.tycho/local/releng.properties
	org.eclipse.modisco.releng.tycho/releasetrain/build.sh
	org.eclipse.modisco.releng.tycho/releasetrain/releng.properties
	org.eclipse.modisco.sdk.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.sdk.feature/feature.xml
	org.eclipse.modisco.smm.quality/META-INF/MANIFEST.MF
	org.eclipse.modisco.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.thirdparties.feature/feature.xml
	org.eclipse.modisco.updatesite/site.xml
	org.eclipse.modisco.usecase.java.samplemetrics/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.java.samplerefactoring/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter.dependencies.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter.feature/feature.xml
	org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.simpletransformationchain.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.simpletransformationschain.feature/feature.xml
	org.eclipse.modisco.usecase.simpletransformationschain.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
	org.eclipse.modisco.util.atl.core/META-INF/MANIFEST.MF
	org.eclipse.modisco.utils.chart.birt.core.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.utils.chart.birt.core/META-INF/MANIFEST.MF
	org.eclipse.modisco.utils.chart.feature/feature.xml
	org.eclipse.modisco.utils.chart.metamodel/META-INF/MANIFEST.MF
	org.eclipse.modisco.utils.core/META-INF/MANIFEST.MF
	org.eclipse.modisco.workflow.core/META-INF/MANIFEST.MF
	org.eclipse.modisco.workflow.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.workflow/META-INF/MANIFEST.MF
	org.eclipse.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.xml.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.xml.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.xml.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.xml.feature/feature.xml

Change-Id: I1de932a42e726848721f3a788a132874222af21f

1 files changed, 21 insertions, 22 deletions

diff --git a/.gitignore b/.gitignore
index 41ee0d092..05ddc7071 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,21 @@
-/*source.feature

-/**/__target__/

-/*/bin/

-/*/pom.xml

-/*/pom.xml.*

-/*/pom.xml.configure-quality-poms.bak

-/*.doc/mediawiki/*.html

-/*.doc/mediawiki/*.xml

-/*.doc/mediawiki/**/*.html

-/*.doc/mediawiki/**/*.xml

-/*.doc/toc.html

-/*.doc.archi/mediawiki/*.html

-/*.doc.archi/mediawiki/*.xml

-/*.tests/screenshots/

-/*.eclipsepackage/pom_updated_modules.xml

-/*.targetplatform/pom.tmp.xml

-/*.updatesite/category.xml

-/*.updatesite/pom_after_updatesite.xml

-/*.updatesite/poma.xml

-/pom.xml*

-/pom_after_configure.xml

-

+/**/__target__/
+/*.doc.archi/mediawiki/*.html
+/*.doc.archi/mediawiki/*.xml
+/*.doc/mediawiki/**/*.html
+/*.doc/mediawiki/**/*.xml
+/*.doc/mediawiki/*.html
+/*.doc/mediawiki/*.xml
+/*.doc/toc.html
+/*.eclipsepackage/pom_updated_modules.xml
+/*.targetplatform/pom.tmp.xml
+/*.tests/screenshots/
+/*.updatesite/category.xml
+/*.updatesite/pom_after_updatesite.xml
+/*.updatesite/poma.xml
+/*/bin/
+/*/pom.xml
+/*/pom.xml.*
+/*/pom.xml.configure-quality-poms.bak
+/*source.feature
+/pom.xml*
+/pom_after_configure.xml