diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2013-02-04 11:32:14 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2013-02-04 11:32:14 +0100 |
| commit | df8de9063ce2008d2e23b46b6464abee03f75e5a (patch) | |
| tree | f297cff880041ebd7ae7252ab4425f9095f2fcba /src/compiler/scala/tools/nsc/typechecker/Analyzer.scala | |
| parent | e67a039ec2e30d612019c8d3ffd644f7f74b00f6 (diff) | |
| parent | f3cdf146709e0dd98533ee77e8ca2566380cb932 (diff) | |
| download | scala-df8de9063ce2008d2e23b46b6464abee03f75e5a.tar.gz scala-df8de9063ce2008d2e23b46b6464abee03f75e5a.tar.bz2 scala-df8de9063ce2008d2e23b46b6464abee03f75e5a.zip | |
Merge commit 'f3cdf146709e0dd98533ee77e8ca2566380cb932'
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Contexts.scala
src/compiler/scala/tools/nsc/typechecker/Namers.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala
src/reflect/scala/reflect/internal/AnnotationCheckers.scala
src/reflect/scala/reflect/internal/Symbols.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Analyzer.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Analyzer.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala b/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala index d4d6def3cb..36121f2653 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala @@ -24,6 +24,7 @@ trait Analyzer extends AnyRef with TypeDiagnostics with ContextErrors with StdAttachments + with AnalyzerPlugins { val global : Global import global._ |