diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.releng.release/release.properties')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.releng.release/release.properties | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng.release/release.properties b/plugins/org.eclipse.emf.cdo.releng.release/release.properties index 0718209125..62a5fbcd03 100644 --- a/plugins/org.eclipse.emf.cdo.releng.release/release.properties +++ b/plugins/org.eclipse.emf.cdo.releng.release/release.properties @@ -1,6 +1,11 @@ # +<<<<<<< Upstream, based on origin/master #Tue Aug 27 08:29:53 CEST 2013 root.projects=org.eclipse.emf.cdo.site-feature org.eclipse.net4j.db.db2-feature org.eclipse.emf.cdo.releng org.eclipse.emf.cdo.releng.doc org.eclipse.emf.cdo.releng.release org.eclipse.emf.cdo.examples.clone org.eclipse.emf.cdo.examples.client org.eclipse.emf.cdo.examples.master org.eclipse.emf.cdo.examples.client.offline +======= +#Tue Aug 27 15:55:39 CEST 2013 +root.projects=org.eclipse.emf.cdo.site-feature org.eclipse.net4j.db.db2-feature org.eclipse.emf.cdo.releng org.eclipse.emf.cdo.releng.doc org.eclipse.emf.cdo.releng.release org.eclipse.emf.cdo.examples.clone org.eclipse.emf.cdo.examples.client org.eclipse.emf.cdo.examples.master org.eclipse.emf.cdo.examples.client.offline org.eclipse.emf.cdo.releng.setup.product org.eclipse.emf.cdo.releng.ui +>>>>>>> aeba188 Improve setup related models baseline.for.integration=true show.deviations=false ignored.references=org.eclipse.emf.cdo.examples.installer.client org.eclipse.emf.cdo.examples.installer.clone org.eclipse.emf.cdo.examples.installer.master org.eclipse.net4j.db.derby org.apache.derby org.eclipse.emf.cdo.server.objectivity org.eclipse.emf.cdo.server.objectivity.stub org.eclipse.emf.cdo.tests.objectivity |