diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-12 17:27:14 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-12 17:27:14 +0200 |
| commit | 630bcc3e917179ff9d415513106e5b4e5065d4fb (patch) | |
| tree | 6e0a59354c15ebfd499b342b62e9e0e008e5fa4d /src/intellij/compiler.iml.SAMPLE | |
| parent | 0bcd0a40dcfda091bbb665b5f0879d9ce3384ab5 (diff) | |
| parent | 1b7e660f74223a847b307613a8ab200923433b13 (diff) | |
| download | scala-630bcc3e917179ff9d415513106e5b4e5065d4fb.tar.gz scala-630bcc3e917179ff9d415513106e5b4e5065d4fb.tar.bz2 scala-630bcc3e917179ff9d415513106e5b4e5065d4fb.zip | |
Merge commit '1b7e660' into merge-2.11-may-12
Diffstat (limited to 'src/intellij/compiler.iml.SAMPLE')
| -rw-r--r-- | src/intellij/compiler.iml.SAMPLE | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/intellij/compiler.iml.SAMPLE b/src/intellij/compiler.iml.SAMPLE index 50253000ab..0e121925e6 100644 --- a/src/intellij/compiler.iml.SAMPLE +++ b/src/intellij/compiler.iml.SAMPLE @@ -1,27 +1,17 @@ <?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="starr" /> - <option name="languageLevel" value="Scala 2.11" /> - <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$/../compiler"> + <sourceFolder url="file://$MODULE_DIR$/../compiler/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/../compiler" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="library" /> <orderEntry type="module" module-name="reflect" /> - <orderEntry type="module" module-name="asm" /> + <orderEntry type="library" name="starr" level="project" /> <orderEntry type="library" name="ant" level="project" /> + <orderEntry type="library" name="asm" level="project" /> </component> -</module> - +</module>
\ No newline at end of file |