diff options
| author | Ed Merks | 2013-10-17 06:41:21 +0000 |
|---|---|---|
| committer | Ed Merks | 2013-10-17 10:33:35 +0000 |
| commit | 01bd70d72aa7ea88543e3b0723b00014092e5b15 (patch) | |
| tree | cf91a5b2ea09c25d4db1a2d29efe806e90e34df1 /plugins/org.eclipse.emf.cdo.releng.release | |
| parent | f3383ce73006201ddcc2430c211b5bc1ed69cc31 (diff) | |
| download | cdo-01bd70d72aa7ea88543e3b0723b00014092e5b15.tar.gz cdo-01bd70d72aa7ea88543e3b0723b00014092e5b15.tar.xz cdo-01bd70d72aa7ea88543e3b0723b00014092e5b15.zip | |
Improve setup related models
Change-Id: I2401d47184d70d5bd5610e7bca3feae362600f95
Signed-off-by: Ed Merks <ed.merks@gmail.com>
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.releng.release')
| -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 |