summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-07-24 08:13:18 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-07-24 08:13:18 -0700
commit5d44a0d2cf40aa9905fbee87c701891d69afc39f (patch)
treed3656fcf73d90de1205dd30243a5440543f49f69 /src/library
parentf5f7570778586e8230439c4dbacb5f49dea185ff (diff)
parent9fecdfd8cb03816f7992c1577e296854c4dc878b (diff)
downloadscala-5d44a0d2cf40aa9905fbee87c701891d69afc39f.tar.gz
scala-5d44a0d2cf40aa9905fbee87c701891d69afc39f.tar.bz2
scala-5d44a0d2cf40aa9905fbee87c701891d69afc39f.zip
Merge pull request #966 from paulp/issue/6117
SI-6117 regression involving import ambiguity.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/reflect/ClassManifestDeprecatedApis.scala (renamed from src/library/scala/reflect/ClassManifest.scala)0
1 files changed, 0 insertions, 0 deletions
diff --git a/src/library/scala/reflect/ClassManifest.scala b/src/library/scala/reflect/ClassManifestDeprecatedApis.scala
index d226e43e77..d226e43e77 100644
--- a/src/library/scala/reflect/ClassManifest.scala
+++ b/src/library/scala/reflect/ClassManifestDeprecatedApis.scala