diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-23 14:41:28 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-23 14:41:28 -0700 |
| commit | 6173274e2731a69a92b2371662959eaf89dd6836 (patch) | |
| tree | a9814b6d600559e584673cc46a55ab6277107208 /src/intellij/compiler.iml.SAMPLE | |
| parent | 5574c7278e4b6687ed61aa62c1694a1adda1ab24 (diff) | |
| parent | 845c4417510d7f19588e584db879c1099d3de1c3 (diff) | |
| download | scala-6173274e2731a69a92b2371662959eaf89dd6836.tar.gz scala-6173274e2731a69a92b2371662959eaf89dd6836.tar.bz2 scala-6173274e2731a69a92b2371662959eaf89dd6836.zip | |
Merge pull request #5055 from lrytz/merge-2.11-to-2.12-mar-21
Merge 2.11 to 2.12
Diffstat (limited to 'src/intellij/compiler.iml.SAMPLE')
| -rw-r--r-- | src/intellij/compiler.iml.SAMPLE | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/intellij/compiler.iml.SAMPLE b/src/intellij/compiler.iml.SAMPLE index 0e121925e6..1ebf409c1b 100644 --- a/src/intellij/compiler.iml.SAMPLE +++ b/src/intellij/compiler.iml.SAMPLE @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../../build/quick/classes/compiler" /> + <output-test url="file://$MODULE_DIR$/../../out/test/compiler" /> <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="library" name="compiler-deps" level="project" /> <orderEntry type="library" name="starr" level="project" /> - <orderEntry type="library" name="ant" level="project" /> - <orderEntry type="library" name="asm" level="project" /> </component> </module>
\ No newline at end of file |