6c382b0e678a3c102744885c3591c1154be1acc0 - amalgam/org.eclipse.amalgam

commit	6c382b0e678a3c102744885c3591c1154be1acc0	[log] [tgz]
author	Damien Filliat <damien.filliat@thalesgroup.com>	Mon Mar 06 11:25:21 2017 +0100
committer	Damien Filliat <damien.filliat@thalesgroup.com>	Mon Mar 06 07:39:44 2017 -0400
tree	18e586badad4024084d74b9b66fcd4c9973cd463
parent	465e57e069a76e8137651609ba7faaa9c39d4475 [diff]
parent	5dd49f78bffe1a25dc8de7741a1073d940a4b3ef [diff]

Merge remote-tracking branch 'origin/v1.7.x'

Conflicts:
	releng/org.eclipse.amalgam.releng/pom.xml
	releng/org.eclipse.amalgam.releng/target_platforms/mars.target
	releng/org.eclipse.amalgam.releng/target_platforms/mars.targetplatform
	releng/org.eclipse.amalgam.releng/target_platforms/neon.target
	releng/org.eclipse.amalgam.releng/target_platforms/neon.targetplatform

+ update Sirius update site location from "stable" to "releases".

Change-Id: I5f896bdc5a96668da586af73256a6e82b1662550
Signed-off-by: Damien Filliat <damien.filliat@thalesgroup.com>

tree: 18e586badad4024084d74b9b66fcd4c9973cd463

features/
plugins/
releng/
tests/
.gitignore