Merge commit 'refs/pull/1718/head' into merge-msil-genjvm-delete

* 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

1 files changed, 0 insertions, 76 deletions

diff --git a/src/msil/ch/epfl/lamp/compiler/msil/ParameterInfo.java b/src/msil/ch/epfl/lamp/compiler/msil/ParameterInfo.java
deleted file mode 100644
index 877d7aa8a5..0000000000
--- a/src/msil/ch/epfl/lamp/compiler/msil/ParameterInfo.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * System.Reflection-like API for access to .NET assemblies (DLL & EXE)
- */
-
-
-package ch.epfl.lamp.compiler.msil;
-
-/**
- * Discovers the attributes of a parameter and provides access to
- * parameter metadata.
- *
- * @author Nikolay Mihaylov
- * @version 1.0
- */
-public class ParameterInfo extends CustomAttributeProvider {
-
-    //##########################################################################
-
-    /** Attributes of the parameter. */
-    public final short Attributes;
-
-    /** Name of the parameter. */
-    public final String Name;
-
-    /** Type of the parameter. */
-    public final Type ParameterType;
-
-    /** Position of the parameter in the parameter list. */
-    public final int Position;
-
-    //##########################################################################
-
-    /** Is this an input parameter? */
-    public final boolean IsIn() {
-        return (Attributes & ParameterAttributes.In) != 0;
-    }
-
-    /** Is this an output parameter? */
-    public final boolean IsOut() {
-        return (Attributes & ParameterAttributes.Out) != 0;
-    }
-
-    /** Is this an Lcid? */
-    public final boolean IsLcid() {
-        return (Attributes & ParameterAttributes.Lcid) != 0;
-    }
-
-    /** Is this a return value? */
-    public final boolean IsRetval() {
-        return (Attributes & ParameterAttributes.Retval) != 0;
-    }
-
-    /** Is this an optional parameter? */
-    public final boolean IsOptional() {
-        return (Attributes & ParameterAttributes.Optional) != 0;
-    }
-
-    //##########################################################################
-    // members not part of the public Reflection.ParameterInfo interface
-
-    /** Initializes a new instance of the ParameterInfo class. */
-    protected ParameterInfo(String name, Type type, int attr, int pos) {
-	Name = name;
-	ParameterType = type;
-	Attributes = (short)attr;
-	Position = pos;
-    }
-
-    public String toString() {
-        return ParameterAttributes.toString(Attributes) + ParameterType + " "
-            + Name;
-    }
-
-    //##########################################################################
-
-}  // class ParameterInfo