It lives on in a branch born from this commit's parent.
It's abrupt; no attempt is made to offer a "smooth transition"
for the serious msil userbase, population zero. If anyone feels
very strongly that such a transition is necessary, I will be
happy to talk you into feeling differently.

* commit 'refs/pull/1717/head':
  SI-6769 Removes GenJVM backend

Conflicts:
	src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala

* commit 'refs/pull/1718/head':
  Expunged the .net backend.

Conflicts:
	build.detach.xml
	build.examples.xml
	build.xml
	project/Build.scala
	src/compiler/scala/tools/ant/Scalac.scala
	src/compiler/scala/tools/nsc/Global.scala
	src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
	src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala
	src/compiler/scala/tools/nsc/transform/Mixin.scala
	src/intellij/compiler.iml.SAMPLE
	tools/buildcp

Apparently this thing depends on trailing spaces because
I can't change it in my trailing-space-stripping editor
without the build failing with this informative message:

  BUILD FAILED
  /scala/trunk/build.xml:1403: Existing manifest /scala/trunk/build/pack/META-INF/MANIFEST.MF is invalid

The whole diff between working and not working is whitespace:

--- i/META-INF/MANIFEST.MF
+++ w/META-INF/MANIFEST.MF
@@ -4,11 +4,11 @@ Bundle-Name: Scala Distribution
 Bundle-SymbolicName: org.scala-ide.scala.compiler;singleton:=true
 Bundle-Version: 2.10.0.alpha
 Eclipse-LazyStart: true
-Bundle-ClassPath:
+Bundle-ClassPath:
  .,
  bin,
  lib/jline.jar,
-Export-Package:
+Export-Package:
  scala.tools.nsc,
  scala.tools.nsc.ast,
  scala.tools.nsc.ast.parser,
@@ -45,7 +45,7 @@ Export-Package:
  scala.reflect.runtime,
  scala.reflect.internal.transform,
  scala.reflect.api,
-Require-Bundle:
+Require-Bundle:
  org.apache.ant,
  org.scala-ide.scala.library
-
+