tree 8e24664bd3a105f5c8be9681c46f0bb485495f8c
parent 2dd64ed98c017784ef60fafde06ad8b567dc7739
author Adrian Sacchi <adrian.sacchi@bsiag.com> 1425299052 +0100
committer Adrian Sacchi <adrian.sacchi@bsiag.com> 1425301922 +0100

bug 412011: CBI Build: Add Eclipse Luna Integration to target file

https://bugs.eclipse.org/bugs/show_bug.cgi?id=412011

updated orbit repo for luna sr2 to R20150124073747

(cherry picked from commit 5f1a84abe999a03ed25f408d65e2e7b0a802ff3d)

Conflicts:
	org.eclipse.scout.target/eclipse-3.10.target
	org.eclipse.scout.target/eclipse-3.10I.target
	org.eclipse.scout.target/eclipse-3.4.target
	org.eclipse.scout.target/eclipse-3.5.target
	org.eclipse.scout.target/eclipse-3.6.target
	org.eclipse.scout.target/eclipse-3.7.target
	org.eclipse.scout.target/eclipse-3.8.target
	org.eclipse.scout.target/eclipse-3.9.target
	org.eclipse.scout.target/eclipse-staging.target

(cherry picked from commit bfe3878c6d65dba770177c95f1462dcf50c6d9cc)

Conflicts:
	org.eclipse.scout.target/eclipse-3.4.target
	org.eclipse.scout.target/eclipse-3.5.target
	org.eclipse.scout.target/eclipse-helios.target
	org.eclipse.scout.target/eclipse-indigo.target
	org.eclipse.scout.target/eclipse-juno.target
	org.eclipse.scout.target/eclipse-kepler.target
	org.eclipse.scout.target/eclipse-luna.target
	org.eclipse.scout.target/eclipse-mars-integration.target
	org.eclipse.scout.target/eclipse-staging.target