Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master

    ================================================================

    Merge commit 'v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master

    Conflicts:
        src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
        src/reflect/scala/reflect/runtime/JavaMirrors.scala

    ================================================================

    Merge -s ours 4e64a27 ([nomaster commit range])

    ================================================================

    Merge commit '0ae7e55' into merge/v2.10.1-326-g4f8c306-to-master

    Conflicts:
        src/compiler/scala/tools/nsc/typechecker/Macros.scala

Author: retronym

.gitattributes

@@ -1,10 +1,16 @@
+# fallback on built-in heuristics
+# this must be first so later entries will override it
+* text=auto
+
 # These files are text and should be normalized (convert crlf => lf)
 *.c       text
 *.check   text
 *.css     text
+*.flags   text
 *.html    text
 *.java    text
 *.js      text
+*.policy  text
 *.sbt     text
 *.scala   text
 *.sh      text

.mailmap

@@ -1,25 +1,74 @@
-Aleksandar Prokopec <aleksandar@aleksandar-Latitude-E6500.(none)>
-Aleksandar Prokopec <aleksandar@htpc.(none)>
-Aleksandar Prokopec <aleksandar@htpc-axel22.(none)>
-Aleksandar Prokopec <[email protected]>
+Adriaan Moors <[email protected]>
+Adriaan Moors <[email protected]> <[email protected]>
+Adriaan Moors <[email protected]> <[email protected]>
 Aleksandar Prokopec <[email protected]>
+Aleksandar Prokopec <[email protected]> <[email protected]>
+Aleksandar Prokopec <[email protected]> <aleksandar@aleksandar-Latitude-E6500.(none)>
+Aleksandar Prokopec <[email protected]> <aleksandar@htpc-axel22.(none)>
+Aleksandar Prokopec <[email protected]> <aleksandar@htpc.(none)>
+Aleksandar Prokopec <[email protected]> <[email protected]>
+Aleksandar Prokopec <[email protected]> <[email protected]>
+Alex Cruise <[email protected]>
+Alex Cruise <[email protected]> <[email protected]>
 Antonio Cunei <[email protected]>
+Antonio Cunei <[email protected]> <[email protected]>
+Buraq Emir <[email protected]>
 Caoyuan Deng <[email protected]>
 Chris Hodapp <[email protected]>
 Chris James <[email protected]>
 Christopher Vogt <[email protected]>
+Christopher Vogt <[email protected]> <[email protected]>
+Christopher Vogt <[email protected]> <[email protected]>
 Damien Obristi <[email protected]>
-Daniel C. Sobral <dcs@dcs-132-CK-NF79.(none)>
+Daniel C. Sobral <[email protected]>
+Daniel C. Sobral <[email protected]> <dcs@dcs-132-CK-NF79.(none)>
+Daniel Lorch <[email protected]>
+Erik Stenman <[email protected]>
+Eugene Burmako <[email protected]>
+Eugene Burmako <[email protected]> <[email protected]>
+Eugene Vigdorchik <[email protected]> <[email protected]>
+Geoff Reedy <[email protected]> <[email protected]>
 Ilya Sergei <[email protected]>
-Ingo Maier <[email protected]>
+Ingo Maier <[email protected]>
+Ingo Maier <[email protected]> <[email protected]>
+Josh Suereth <[email protected]>
+Josh Suereth <[email protected]> <[email protected]>
+Julien Eberle <[email protected]>
 Kenji Yoshida <[email protected]>
+Luc Bourlier <[email protected]>
+Luc Bourlier <[email protected]> <[email protected]>
 Luc Bourlier <[email protected]>
-Martin Odersky <[email protected]>
+Martin Odersky <[email protected]>
+Martin Odersky <[email protected]> <[email protected]>
+Michael Pradel <[email protected]>
+Michel Schinz <[email protected]>
+Miguel Garcia <[email protected]>
+Miguel Garcia <[email protected]> <[email protected]>
+Mirco Dotta <[email protected]>
+Mirco Dotta <[email protected]> <[email protected]>
+Moez A. Abdel-Gawad <[email protected]>
+Mohsen Lesani <[email protected]>
 Nada Amin <[email protected]>
-Nada Amin <[email protected]>
+Nada Amin <[email protected]> <[email protected]>
+Nada Amin <[email protected]> <[email protected]>
 Natallie Baikevich <[email protected]>
+Nikolay Mihaylov <[email protected]>
+Paolo Giarrusso <[email protected]>
 Pavel Pavlov <[email protected]>
 Philipp Haller <[email protected]>
+Philipp Haller <[email protected]> <[email protected]>
+Philippe Altherr <[email protected]>
+Raphaël Noir <[email protected]>
 Roland Kuhn <[email protected]>
 Rüdiger Klaehn <[email protected]>
+Sebastian Hack <[email protected]>
+Simon Ochsenreither <[email protected]>
+Stepan Koltsov <[email protected]>
 Stéphane Micheloud <[email protected]>
+Unknown Committer <[email protected]>
+Unknown Committer <[email protected]> <[email protected]>
+Unknown Committer <[email protected]> <[email protected]>
+Viktor Klang <[email protected]>
+Vincent Cremet <[email protected]>
+Vojin Jovanovic <[email protected]>
+Vojin Jovanovic <[email protected]> <[email protected]>

META-INF/MANIFEST.MF

@@ -7,9 +7,7 @@ Eclipse-LazyStart: true
 Bundle-ClassPath: 
  .,
  bin,
- lib/fjbg.jar,
  lib/jline.jar,
- lib/msil.jar
 Export-Package: 
  scala.tools.nsc,
  scala.tools.nsc.ast,
@@ -47,11 +45,6 @@ Export-Package:
  scala.reflect.runtime,
  scala.reflect.internal.transform,
  scala.reflect.api,
- ch.epfl.lamp.compiler.msil,
- ch.epfl.lamp.compiler.msil.emit,
- ch.epfl.lamp.compiler.msil.util,
- ch.epfl.lamp.fjbg,
- ch.epfl.lamp.util
 Require-Bundle: 
  org.apache.ant,
  org.scala-ide.scala.library

README.rst

@@ -7,18 +7,17 @@ and how to build it. For information about Scala as a language, you can visit
 the web site http://www.scala-lang.org/
 
 Part I. The repository layout
---------------------------------------------------------------------------------                            
+--------------------------------------------------------------------------------
 
 Follows the file layout of the Scala repository. Files marked with a † are not
 part of the repository but are either automatically generated by the
-build script or user-created if needed.  This is not a complete listing. :: 
+build script or user-created if needed.  This is not a complete listing. ::
   scala/
    +--build/                    Build products output directory for ant.
    +--build.xml                 The main Ant build script.
    +--dist/                     The destination folder for Scala distributions.
    +--docs/                     Documentation and sample code.
    +--lib/                      Pre-compiled libraries for the build.
-   |   +--fjbg.jar              The Java byte-code generation library.
    |   +--scala-compiler.jar    The stable reference ('starr') compiler jar
    |   +--scala-library.jar     The stable reference ('starr') library jar
    |   +--scala-library-src.jar A snapshot of the source used to build starr.
@@ -68,7 +67,7 @@ description of the four layers that SABBUS uses, from bottom to top:
 - ``strap``: a test layer used to check stability of the build.
 
 ^^^^^^^^^^^^^^^^^^^^^^^^
-  DEPENDANT CHANGES:
+  DEPENDENT CHANGES:
 ^^^^^^^^^^^^^^^^^^^^^^^^
 SABBUS compiles, for each layer, the Scala library first and the compiler next.
 That means that any changes in the library can immediately be used in the
@@ -111,12 +110,12 @@ Part III. Common use-cases
 
 - ``ln -s build/quick/bin qbin`` (once):
 - ``ant && qbin/scalac -d sandbox sandbox/test.scala && qbin/scala -cp sandbox Test``
-  
+
   Incrementally builds quick, and then uses it to compile and run the file
   ``sandbox/test.scala``. This is a typical debug cycle.
 
 - ``ant replacelocker``
-  
+
   "unfreezes" locker by updating it to match the current source code.
 
   - This will delete quick so as not to mix classes compiled with different
@@ -137,7 +136,7 @@ Part III. Common use-cases
     ANT_OPTS="-Xms512M -Xmx2048M -Xss1M -XX:MaxPermSize=128M" ant docs
 
 - ``ant dist``
-  
+
   Builds a distribution.
 
   - Rebuilds locker from scratch (to make sure it bootstraps).