diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-07-13 08:42:11 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-07-13 11:45:02 +1000 |
| commit | 18e3e61778918e4e802b8fb75789635409523372 (patch) | |
| tree | 18d67da301f0b63667e9393d3e336b1fcb5e1875 /src/reflect/scala/reflect/api | |
| parent | b92c3aff1ab8c76c4816bd7b1a82a0f87d787837 (diff) | |
| parent | 52fde52920d93325310e5544991feeea03e5c763 (diff) | |
| download | scala-18e3e61778918e4e802b8fb75789635409523372.tar.gz scala-18e3e61778918e4e802b8fb75789635409523372.tar.bz2 scala-18e3e61778918e4e802b8fb75789635409523372.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150713
Conflicts:
src/eclipse/partest/.classpath
src/eclipse/repl/.classpath
test/files/run/nothingTypeNoFramesNoDce.scala
test/files/run/repl-javap-app.check
Also fixup two .classpath files with updated partest, xml and
parser combinators JARs.
Diffstat (limited to 'src/reflect/scala/reflect/api')
| -rw-r--r-- | src/reflect/scala/reflect/api/Internals.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/api/Internals.scala b/src/reflect/scala/reflect/api/Internals.scala index 577cd09295..1457fdc133 100644 --- a/src/reflect/scala/reflect/api/Internals.scala +++ b/src/reflect/scala/reflect/api/Internals.scala @@ -114,7 +114,7 @@ trait Internals { self: Universe => def substituteTypes(tree: Tree, from: List[Symbol], to: List[Type]): Tree /** Substitute given tree `to` for occurrences of nodes that represent - * `C.this`, where `C` referes to the given class `clazz`. + * `C.this`, where `C` refers to the given class `clazz`. */ def substituteThis(tree: Tree, clazz: Symbol, to: Tree): Tree |