diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-08-08 08:52:31 +0200 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-08-08 08:52:31 +0200 |
| commit | 0ea83a289e80c973e42810aee83e0f4a7102fee5 (patch) | |
| tree | 12283d2855c3d66f67e7c80939bb39e15af9a449 /src/compiler/scala/tools/nsc/transform/Flatten.scala | |
| parent | 1241e40ed4442abd635f44ce997013268b956b4b (diff) | |
| parent | 45d045f8e3d7006890c5a3a187b8b2fc262ad5c7 (diff) | |
| download | scala-0ea83a289e80c973e42810aee83e0f4a7102fee5.tar.gz scala-0ea83a289e80c973e42810aee83e0f4a7102fee5.tar.bz2 scala-0ea83a289e80c973e42810aee83e0f4a7102fee5.zip | |
Merge branch '2.10.x'
Conflicts:
src/compiler/scala/tools/nsc/ast/TreeGen.scala
src/compiler/scala/tools/nsc/settings/AestheticSettings.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/Flatten.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Flatten.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Flatten.scala b/src/compiler/scala/tools/nsc/transform/Flatten.scala index 2a3eb9959c..de2f96c378 100644 --- a/src/compiler/scala/tools/nsc/transform/Flatten.scala +++ b/src/compiler/scala/tools/nsc/transform/Flatten.scala @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2011 LAMP/EPFL + * Copyright 2005-2012 LAMP/EPFL * @author Martin Odersky */ |