diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-04 21:41:50 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-04 21:41:50 -0800 |
| commit | d5b3c273481a070b9c1e08e0dfeae303ac619292 (patch) | |
| tree | 451396c079e2dd3aab567f0c936c575a512c0521 /src | |
| parent | 84bf74e3346a5b42199572930d303900a3675b22 (diff) | |
| parent | 3b69e08867428171abf9ead416fe32b7bc77f603 (diff) | |
| download | scala-d5b3c273481a070b9c1e08e0dfeae303ac619292.tar.gz scala-d5b3c273481a070b9c1e08e0dfeae303ac619292.tar.bz2 scala-d5b3c273481a070b9c1e08e0dfeae303ac619292.zip | |
Merge branch 'master' into topic/inline
Diffstat (limited to 'src')
| -rw-r--r-- | src/intellij/scala-lang.ipr.SAMPLE | 3 | ||||
| -rw-r--r-- | src/intellij/scala.iml.SAMPLE | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/intellij/scala-lang.ipr.SAMPLE b/src/intellij/scala-lang.ipr.SAMPLE index 4d32f0e2e1..93b6285cfb 100644 --- a/src/intellij/scala-lang.ipr.SAMPLE +++ b/src/intellij/scala-lang.ipr.SAMPLE @@ -32,7 +32,7 @@ <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" /> <component name="EntryPointsManager"> <entry_points version="2.0" /> - </component> + </component> <component name="InspectionProjectProfileManager"> <profiles> <profile version="1.0" is_locked="false"> @@ -201,6 +201,7 @@ <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$/partest.iml" filepath="$PROJECT_DIR$/partest.iml" /> + <module fileurl="file://$PROJECT_DIR$/scala.iml" filepath="$PROJECT_DIR$/scala.iml" /> <module fileurl="file://$PROJECT_DIR$/scalap.iml" filepath="$PROJECT_DIR$/scalap.iml" /> <module fileurl="file://$PROJECT_DIR$/swing.iml" filepath="$PROJECT_DIR$/swing.iml" /> </modules> diff --git a/src/intellij/scala.iml.SAMPLE b/src/intellij/scala.iml.SAMPLE new file mode 100644 index 0000000000..8ea9d0dd71 --- /dev/null +++ b/src/intellij/scala.iml.SAMPLE @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$/../.." /> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> + |