diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2016-04-16 12:50:31 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2016-04-16 12:50:31 +0200 |
commit | 29bb1ab72d68ff9a19cb3e1d99d4a4a9060e55a1 (patch) | |
tree | 39c2d27a7b188e55c5c1ccc1379c7b7a36304ab9 /build | |
parent | 1b0b78dabc99a21e36921055b35069cd39de6e1d (diff) | |
parent | 4cdec74e94728605089587f2fd0667b3b3e4e558 (diff) | |
download | forums-29bb1ab72d68ff9a19cb3e1d99d4a4a9060e55a1.tar forums-29bb1ab72d68ff9a19cb3e1d99d4a4a9060e55a1.tar.gz forums-29bb1ab72d68ff9a19cb3e1d99d4a4a9060e55a1.tar.bz2 forums-29bb1ab72d68ff9a19cb3e1d99d4a4a9060e55a1.tar.xz forums-29bb1ab72d68ff9a19cb3e1d99d4a4a9060e55a1.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 205286c236..24d935ad90 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-b3-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.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.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}" /> |