diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-06 15:07:08 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-06 15:07:08 -0800 |
| commit | fe86aedf4acbb16159c8036edeadbda0bd380771 (patch) | |
| tree | 27c00ec8e2a50815985c8f1d3bf4793e318c6a20 /src/library/scala/native.scala | |
| parent | 9d265965294e65c8f20a027254042c9468af83d9 (diff) | |
| parent | a5714183d1a197f5b7b69306db6be28b2724bbb7 (diff) | |
| download | scala-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/library/scala/native.scala')
| -rw-r--r-- | src/library/scala/native.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/native.scala b/src/library/scala/native.scala index 798af3a5da..dbacc78618 100644 --- a/src/library/scala/native.scala +++ b/src/library/scala/native.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** |