diff options
| author | Eike Stepper | 2011-06-25 12:43:13 +0000 |
|---|---|---|
| committer | Eike Stepper | 2011-06-25 12:43:13 +0000 |
| commit | 55d30a9eb540be5e5a71446478e03ce7f6d4860e (patch) | |
| tree | cb5079f8ca36e615723dba7571cae9c397c919c1 | |
| parent | b60d9694563d79d0555f323af1260e723bbebf33 (diff) | |
| download | cdo-55d30a9eb540be5e5a71446478e03ce7f6d4860e.tar.gz cdo-55d30a9eb540be5e5a71446478e03ce7f6d4860e.tar.xz cdo-55d30a9eb540be5e5a71446478e03ce7f6d4860e.zip | |
merged updates from trunk
| -rw-r--r-- | releng/org.eclipse.emf.cdo.releng/build.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/releng/org.eclipse.emf.cdo.releng/build.xml b/releng/org.eclipse.emf.cdo.releng/build.xml index 571db35a70..ba147909fd 100644 --- a/releng/org.eclipse.emf.cdo.releng/build.xml +++ b/releng/org.eclipse.emf.cdo.releng/build.xml @@ -1,15 +1,9 @@ <?xml version="1.0"?> <project name="CDO"> -<<<<<<< .working
<property name="stream" value="4.0" /> <property name="branch" value="branches/4.0-maintenance" /> -=======
- <property name="stream" value="4.1" /> - <property name="branch" value="trunk" /> - ->>>>>>> .merge-right.r8409
<condition property="properties.file" value="build.properties" else="local.properties"> <isset property="server.build" /> </condition> |