summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2012-11-06 15:07:08 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2012-11-06 15:07:08 -0800
commitfe86aedf4acbb16159c8036edeadbda0bd380771 (patch)
tree27c00ec8e2a50815985c8f1d3bf4793e318c6a20 /src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
parent9d265965294e65c8f20a027254042c9468af83d9 (diff)
parenta5714183d1a197f5b7b69306db6be28b2724bbb7 (diff)
downloadscala-fe86aedf4acbb16159c8036edeadbda0bd380771.tar.gz
scala-fe86aedf4acbb16159c8036edeadbda0bd380771.tar.bz2
scala-fe86aedf4acbb16159c8036edeadbda0bd380771.zip
Merge pull request #1576 from paulp/merge-210
Merge 2.10.x/2.10.0-RC2 into master
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
index 049348b0b8..288b7d761f 100644
--- a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
@@ -1,5 +1,5 @@
/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
+ * Copyright 2005-2013 LAMP/EPFL
* @author Paul Phillips
*/
package scala.tools.nsc