diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-08-14 08:56:26 +0200 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-08-14 09:37:19 +0200 |
| commit | 3ccaa1026e7e74d99fe39c9608e28c48b422e2c9 (patch) | |
| tree | a1187b22900d5904f9ba6e5664440a8248491f5a /docs | |
| parent | 48d9fb7307fb6519fe786a7d9be97996c5812fb7 (diff) | |
| parent | 12baa2ea399b4f281c62fd20479c1e626f244d03 (diff) | |
| download | scala-3ccaa1026e7e74d99fe39c9608e28c48b422e2c9.tar.gz scala-3ccaa1026e7e74d99fe39c9608e28c48b422e2c9.tar.bz2 scala-3ccaa1026e7e74d99fe39c9608e28c48b422e2c9.zip | |
Merge branch '2.10.x'
Conflicts:
src/compiler/scala/tools/nsc/Global.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
test/files/neg/t6048.check
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/LICENSE | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/LICENSE b/docs/LICENSE index 38d16361bd..de950bdf57 100644 --- a/docs/LICENSE +++ b/docs/LICENSE @@ -1,6 +1,6 @@ SCALA LICENSE -Copyright (c) 2002-2011 EPFL, Lausanne, unless otherwise specified. +Copyright (c) 2002-2012 EPFL, Lausanne, unless otherwise specified. All rights reserved. This software was developed by the Programming Methods Laboratory of the |