Commit 6d29764

authored

Merge pull request scala#6026 from SethTisue/merge/2.12.x-to-2.13.x-20170804

Merge/2.12.x to 2.13.x 20170804 [ci: last-only]

2 parents 6544643 + 88b9fa9 commit 6d29764Copy full SHA for 6d29764

16 files changed

+72

-501

lines changed

bincompat-backward.whitelist.conf
bincompat-forward.whitelist.conf
build.sbt
project
scripts
- common
spec
- README.md
src
- compiler/scala/tools/nsc
  - backend/jvm
    - BCodeHelpers.scala
  - transform
    - Constructors.scala
- intellij
  - scala.ipr.SAMPLE
- reflect/mima-filters
  - 2.13.0.backwards.excludes
  - 2.13.0.forwards.excludes
test
- benchmarks/project
  - build.properties
- files/run/t10423
  - A_1.scala
  - A_2.scala

16 files changed

+72

-501

lines changed

`‎bincompat-backward.whitelist.conf`

This file was deleted.

`‎bincompat-forward.whitelist.conf`

This file was deleted.

Comments

(0)