diff options
author | Paul Phillips <paulp@improving.org> | 2012-12-06 12:20:31 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-12-06 12:20:31 -0800 |
commit | 6ee2ce50a56237eed07bcc6b6198f97779208a02 (patch) | |
tree | df7a9386e892beafff42bddcc0347f9337cfd3df /src/intellij | |
parent | 330c77b097782ed389a83175302379ea72d22c41 (diff) | |
parent | 96fa31d0a3cf7ff401f9197cd0e12acd296e55b1 (diff) | |
download | scala-6ee2ce50a56237eed07bcc6b6198f97779208a02.tar.gz scala-6ee2ce50a56237eed07bcc6b6198f97779208a02.tar.bz2 scala-6ee2ce50a56237eed07bcc6b6198f97779208a02.zip |
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
Diffstat (limited to 'src/intellij')
-rw-r--r-- | src/intellij/compiler.iml.SAMPLE | 1 | ||||
-rw-r--r-- | src/intellij/msil.iml.SAMPLE | 24 | ||||
-rw-r--r-- | src/intellij/scala-lang.ipr.SAMPLE | 1 | ||||
-rw-r--r-- | src/intellij/test.iml.SAMPLE | 1 |
4 files changed, 0 insertions, 27 deletions
diff --git a/src/intellij/compiler.iml.SAMPLE b/src/intellij/compiler.iml.SAMPLE index a3ac93cc77..f8b1f31327 100644 --- a/src/intellij/compiler.iml.SAMPLE +++ b/src/intellij/compiler.iml.SAMPLE @@ -20,7 +20,6 @@ <orderEntry type="module" module-name="library" /> <orderEntry type="module" module-name="reflect" /> <orderEntry type="module" module-name="asm" /> - <orderEntry type="module" module-name="msil" /> <orderEntry type="library" name="ant" level="application" /> <orderEntry type="library" name="jline" level="project" /> </component> diff --git a/src/intellij/msil.iml.SAMPLE b/src/intellij/msil.iml.SAMPLE deleted file mode 100644 index 56f794785f..0000000000 --- a/src/intellij/msil.iml.SAMPLE +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="scala" name="Scala"> - <configuration> - <option name="compilerLibraryLevel" value="Project" /> - <option name="compilerLibraryName" value="compiler-locker" /> - <option name="maximumHeapSize" value="1536" /> - <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseCompressedOops -XX:+UseParallelGC" /> - </configuration> - </facet> - </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$/../msil"> - <sourceFolder url="file://$MODULE_DIR$/../msil" isTestSource="false" /> - <excludeFolder url="file://$MODULE_DIR$/../msil/ch/epfl/lamp/compiler/msil/tests" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="library" /> - </component> -</module> - diff --git a/src/intellij/scala-lang.ipr.SAMPLE b/src/intellij/scala-lang.ipr.SAMPLE index a532d8c5c8..a8cb5eacc1 100644 --- a/src/intellij/scala-lang.ipr.SAMPLE +++ b/src/intellij/scala-lang.ipr.SAMPLE @@ -201,7 +201,6 @@ <module fileurl="file://$PROJECT_DIR$/forkjoin.iml" filepath="$PROJECT_DIR$/forkjoin.iml" /> <module fileurl="file://$PROJECT_DIR$/library.iml" filepath="$PROJECT_DIR$/library.iml" /> <module fileurl="file://$PROJECT_DIR$/manual.iml" filepath="$PROJECT_DIR$/manual.iml" /> - <module fileurl="file://$PROJECT_DIR$/msil.iml" filepath="$PROJECT_DIR$/msil.iml" /> <module fileurl="file://$PROJECT_DIR$/partest.iml" filepath="$PROJECT_DIR$/partest.iml" /> <module fileurl="file://$PROJECT_DIR$/reflect.iml" filepath="$PROJECT_DIR$/reflect.iml" /> <module fileurl="file://$PROJECT_DIR$/scala.iml" filepath="$PROJECT_DIR$/scala.iml" /> diff --git a/src/intellij/test.iml.SAMPLE b/src/intellij/test.iml.SAMPLE index 424872ccb6..3ce369be05 100644 --- a/src/intellij/test.iml.SAMPLE +++ b/src/intellij/test.iml.SAMPLE @@ -13,7 +13,6 @@ <orderEntry type="module" module-name="partest" /> <orderEntry type="module" module-name="asm" /> <orderEntry type="module" module-name="forkjoin" /> - <orderEntry type="module" module-name="msil" /> </component> </module> |