This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository scala.

commit a35e40f8557be7120951b4e06bfbff4e3a2a157b
Merge: 378b69e 905ae7e
Author: Emmanuel Bourg <ebo...@apache.org>
Date:   Fri Mar 30 11:47:24 2018 +0200

    Update upstream source from tag 'upstream/2.11.11'
    
    Update to upstream version '2.11.11'
    with Debian dir bcbdc62f8717dc14aacd11e4abe46055c176f6c9

 README.md                                             |  5 ++---
 build.number                                          |  2 +-
 build.sbt                                             |  2 +-
 scripts/jobs/integrate/windows                        |  2 +-
 spec/_layouts/default.yml                             |  2 +-
 src/compiler/scala/tools/nsc/typechecker/Namers.scala | 17 +++++++++++++++--
 src/compiler/scala/tools/nsc/typechecker/Typers.scala |  6 +++++-
 test/benchmarks/build.sbt                             |  2 +-
 test/files/neg/userdefined_apply.flags                |  1 +
 test/files/pos/userdefined_apply.flags                |  1 +
 test/files/pos/userdefined_apply_poly_overload.flags  |  1 +
 test/files/run/t10261.flags                           |  1 +
 test/files/run/t10261/Companion_1.scala               |  4 ++++
 test/files/run/t10261/Test_2.scala                    | 14 ++++++++++++++
 versions.properties                                   |  4 ++--
 15 files changed, 51 insertions(+), 13 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/scala.git

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to