diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-08-21 11:17:55 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-08-21 11:17:55 -0700 |
| commit | d34b4c8d74407f5b2be1a344e41f2ecdeb25f4fe (patch) | |
| tree | 1263896cdf5d3e25697287c40cf3a1d35de8e95d /.idea | |
| parent | 4db7dfd37df60de478b5d99be0554bc0e06dfdba (diff) | |
| download | idea-d34b4c8d74407f5b2be1a344e41f2ecdeb25f4fe.tar.gz | |
Snapshot 32d31e4915ef17b3ec6ec4e87923f017e8e41bce from master branch of git://git.jetbrains.org/idea/community.git
Change-Id: Idb2188c1f4e63d654aa3e3b832b9121d0be2dbe9
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/codeStyleSettings.xml | 12 | ||||
| -rw-r--r-- | .idea/compiler.xml | 1 | ||||
| -rw-r--r-- | .idea/libraries/Netty.xml | 4 | ||||
| -rw-r--r-- | .idea/modules.xml | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml index 0b13401d8804..d8fe919d6501 100644 --- a/.idea/codeStyleSettings.xml +++ b/.idea/codeStyleSettings.xml @@ -90,9 +90,6 @@ <XML> <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" /> </XML> - <ADDITIONAL_INDENT_OPTIONS fileType="rb"> - <option name="INDENT_SIZE" value="2" /> - </ADDITIONAL_INDENT_OPTIONS> <codeStyleSettings language="CFML"> <option name="KEEP_LINE_BREAKS" value="false" /> <option name="ELSE_ON_NEW_LINE" value="true" /> @@ -265,6 +262,15 @@ <option name="TAB_SIZE" value="8" /> </indentOptions> </codeStyleSettings> + <codeStyleSettings language="ruby"> + <option name="KEEP_LINE_BREAKS" value="false" /> + <option name="PARENT_SETTINGS_INSTALLED" value="true" /> + <indentOptions> + <option name="CONTINUATION_INDENT_SIZE" value="8" /> + <option name="TAB_SIZE" value="4" /> + <option name="USE_RELATIVE_INDENTS" value="false" /> + </indentOptions> + </codeStyleSettings> </value> </option> <option name="USE_PER_PROJECT_SETTINGS" value="true" /> diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 890698c3ab9a..3292edb594ae 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -26,6 +26,7 @@ </profile> </annotationProcessing> <bytecodeTargetLevel target="1.6"> + <module name="annotations" target="1.5" /> <module name="groovy-rt-constants" target="1.5" /> <module name="groovy_rt" target="1.5" /> <module name="java-runtime" target="1.3" /> diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml index 7cbf980422e9..3fbc53150ef8 100644 --- a/.idea/libraries/Netty.xml +++ b/.idea/libraries/Netty.xml @@ -1,11 +1,11 @@ <component name="libraryTable"> <library name="Netty"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/netty-3.6.6.Final.jar!/" /> + <root url="jar://$PROJECT_DIR$/lib/netty-all.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$PROJECT_DIR$/lib/src/netty-3.6.6.Final-sources.jar!/" /> + <root url="jar://$PROJECT_DIR$/lib/src/netty-all-sources.jar!/" /> </SOURCES> </library> </component>
\ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index bacca10b849f..6ec45a2f1a90 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -100,6 +100,7 @@ <module fileurl="file://$PROJECT_DIR$/platform/lang-impl/lang-impl.iml" filepath="$PROJECT_DIR$/platform/lang-impl/lang-impl.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/platform/lvcs-api/lvcs-api.iml" filepath="$PROJECT_DIR$/platform/lvcs-api/lvcs-api.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/platform/lvcs-impl/lvcs-impl.iml" filepath="$PROJECT_DIR$/platform/lvcs-impl/lvcs-impl.iml" group="platform" /> + <module fileurl="file://$PROJECT_DIR$/java/manifest/manifest.iml" filepath="$PROJECT_DIR$/java/manifest/manifest.iml" group="java" /> <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven.iml" filepath="$PROJECT_DIR$/plugins/maven/maven.iml" group="plugins/maven" /> <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/maven-artifact-resolver-m2.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/maven-artifact-resolver-m2.iml" group="plugins/maven" /> <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml" group="plugins/maven" /> @@ -120,6 +121,7 @@ <module fileurl="file://$PROJECT_DIR$/xml/relaxng/relaxng.iml" filepath="$PROJECT_DIR$/xml/relaxng/relaxng.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/platform/remote-servers/api/remote-servers-api.iml" filepath="$PROJECT_DIR$/platform/remote-servers/api/remote-servers-api.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/platform/remote-servers/impl/remote-servers-impl.iml" filepath="$PROJECT_DIR$/platform/remote-servers/impl/remote-servers-impl.iml" group="platform" /> + <module fileurl="file://$PROJECT_DIR$/java/remote-servers/remote-servers-java.iml" filepath="$PROJECT_DIR$/java/remote-servers/remote-servers-java.iml" /> <module fileurl="file://$PROJECT_DIR$/resources/resources.iml" filepath="$PROJECT_DIR$/resources/resources.iml" /> <module fileurl="file://$PROJECT_DIR$/resources-en/resources-en.iml" filepath="$PROJECT_DIR$/resources-en/resources-en.iml" /> <module fileurl="file://$PROJECT_DIR$/platform/smRunner/smRunner.iml" filepath="$PROJECT_DIR$/platform/smRunner/smRunner.iml" group="platform" /> |