diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-10-12 21:43:35 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-10-12 21:43:35 +0200 |
| commit | 84a8cf00ad9e51ae1463b1d02ec11b211b8b1ff6 (patch) | |
| tree | 7fc6c438091fc78fdc9ada32d67719c153befba9 /build | |
| parent | 322b86da1f6b497d38fb346d233d64d97a5d2b14 (diff) | |
| parent | 1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31 (diff) | |
| download | forums-84a8cf00ad9e51ae1463b1d02ec11b211b8b1ff6.tar forums-84a8cf00ad9e51ae1463b1d02ec11b211b8b1ff6.tar.gz forums-84a8cf00ad9e51ae1463b1d02ec11b211b8b1ff6.tar.bz2 forums-84a8cf00ad9e51ae1463b1d02ec11b211b8b1ff6.tar.xz forums-84a8cf00ad9e51ae1463b1d02ec11b211b8b1ff6.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml index 84ff43415f..9cf222ae9e 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ <!-- a few settings for the build --> <property name="newversion" value="3.2.0-RC2-dev" /> <property name="prevversion" value="3.2.0-b2" /> - <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1" /> + <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |