diff options
| author | mihaylov <mihaylov@epfl.ch> | 2007-05-15 10:46:54 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2007-05-15 10:46:54 +0000 |
| commit | 9450c16f193ecab560f9374f7965a60be3b09c18 (patch) | |
| tree | 03a4f5327a7f2f941d93c71e4a3ad8ba0d3f17cc /src/library | |
| parent | 8de5ae2b13556c5dea09049b79a40b378e93d008 (diff) | |
| download | scala-9450c16f193ecab560f9374f7965a60be3b09c18.tar.gz scala-9450c16f193ecab560f9374f7965a60be3b09c18.tar.bz2 scala-9450c16f193ecab560f9374f7965a60be3b09c18.zip | |
Synced src/dotnet-library with src/library rev ...
Synced src/dotnet-library with src/library rev 11027
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/Array.scala | 1 | ||||
| -rw-r--r-- | src/library/scala/util/Properties.scala (renamed from src/library/scala/runtime/Properties.scala) | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/library/scala/Array.scala b/src/library/scala/Array.scala index 5de6796040..fad177d88c 100644 --- a/src/library/scala/Array.scala +++ b/src/library/scala/Array.scala @@ -188,7 +188,6 @@ object Array { * @version 1.0 */ final class Array[A](_length: Int) extends Seq[A] { - import java.lang.Error /** The length of the array */ def length: Int = throw new Error() diff --git a/src/library/scala/runtime/Properties.scala b/src/library/scala/util/Properties.scala index 3e46646f2b..d6e77ffa60 100644 --- a/src/library/scala/runtime/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -8,7 +8,7 @@ // $Id$ -package scala.runtime +package scala.util /** A utility to load the library properties from a Java properties file * included in the jar. |