Merge branch '2.10.x'

* 2.10.x: (36 commits)
  Normalized line endings.
  New .gitattributes file.
  Disabled failing build manager tests.
  New test case for SI-6337
  New test case for closing SI-6385
  Value classes: eliminated half-boxing
  Cleanup of OverridingPairs
  Fixes SI-6260
  Use faster download URL now that artifactory is fixed.
  don't try to create tags w/o scala-reflect.jar
  some small remaining fixes
  SI-5943 toolboxes now autoimport Predef and scala
  Fix for loud test.
  SI-6363 deploys the updated starr
  SI-6363 removes scala.reflect.base
  SI-6392 wraps non-terms before typecheck/eval
  SI-6394 fixes macros.Context.enclosingClass
  Error message improvement for SI-6336.
  Adjustments to scala.concurrent.duration.
  prepping for the refactoring
  ...

Conflicts:
	src/actors-migration/scala/actors/Pattern.scala
	src/compiler/scala/tools/nsc/Global.scala
	src/compiler/scala/tools/nsc/transform/Erasure.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/library/scala/collection/immutable/Vector.scala
	test/files/jvm/actmig-PinS_1.scala
	test/files/jvm/actmig-PinS_2.scala
	test/files/jvm/actmig-PinS_3.scala
	test/files/jvm/actmig-public-methods_1.scala

1 files changed, 3 insertions, 6 deletions

diff --git a/test/files/run/newTags.scala b/test/files/run/newTags.scala
index a758599515..c5199d4e55 100644
--- a/test/files/run/newTags.scala
+++ b/test/files/run/newTags.scala
@@ -1,14 +1,11 @@
-import scala.reflect.base.{Universe => BaseUniverse}
-import scala.reflect.{basis => rb}
+import scala.reflect.api.{Universe => ApiUniverse}
 import scala.reflect.runtime.{universe => ru}
 
 object Test extends App {
-  println(rb.typeOf[List[Int]])
   println(ru.typeOf[List[Int]])
-  def foo[T: rb.TypeTag] = {
-    println(rb.typeOf[T])
+  def foo[T: ru.TypeTag] = {
     println(ru.typeOf[T])
-    println(implicitly[BaseUniverse#TypeTag[T]])
+    println(implicitly[ApiUniverse#TypeTag[T]])
   }
   foo[Map[String, String]]
 }
\ No newline at end of file