diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-09-17 11:44:20 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-09-17 11:44:20 +1000 |
| commit | 5c6e7b3d6587107bf6f9746c9be8643b53321614 (patch) | |
| tree | 319c7d297d26d577190c0a977bf03e0a5f3f2870 /.travis.yml | |
| parent | be825be0b0c5dcbd210c52295022ccee0a859262 (diff) | |
| parent | 223e207e5a4904bf9a6bd70972fa69452d228529 (diff) | |
| download | scala-5c6e7b3d6587107bf6f9746c9be8643b53321614.tar.gz scala-5c6e7b3d6587107bf6f9746c9be8643b53321614.tar.bz2 scala-5c6e7b3d6587107bf6f9746c9be8643b53321614.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20140917
Conflicts:
build.xml
The merge conflict was centred around the introduction of
the build property `test.bc.skip`, and was straight forward
to resolve.
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions